Merge lp:~kent/libmemcached/KBDocs2 into lp:~tangent-org/libmemcached/trunk

Proposed by KentBozlinski
Status: Merged
Merged at revision: 946
Proposed branch: lp:~kent/libmemcached/KBDocs2
Merge into: lp:~tangent-org/libmemcached/trunk
Diff against target: 189 lines (+147/-5)
4 files modified
docs/hashkit_create.rst (+12/-1)
docs/libmemcached.rst (+2/-0)
docs/memcached_return_t.rst (+129/-0)
docs/memcached_set.rst (+4/-4)
To merge this branch: bzr merge lp:~kent/libmemcached/KBDocs2
Reviewer Review Type Date Requested Status
Libmemcached-developers Pending
Review via email: mp+63073@code.launchpad.net

Description of the change

Docs update, added memcached_return_t.rst. minor updates to several other files.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'docs/hashkit_create.rst'
--- docs/hashkit_create.rst 2011-05-24 01:36:22 +0000
+++ docs/hashkit_create.rst 2011-06-01 06:29:28 +0000
@@ -19,7 +19,18 @@
19.. c:function:: bool hashkit_is_allocated(const hashkit_st *hash);19.. c:function:: bool hashkit_is_allocated(const hashkit_st *hash);
2020
21Compile and link with -lhashkit21Compile and link with -lhashkit
2222=======
23
24
25.. c:function:: perl
26
27.. c:function:: hashkit_st *hashkit_create(hashkit_st *hash);
28
29.. c:function:: hashkit_st *hashkit_clone(hashkit_st *destination, const hashkit_st *ptr);
30
31.. c:function:: void hashkit_free(hashkit_st *hash);
32
33.. c:function:: bool hashkit_is_allocated(const hashkit_st *hash);
2334
24-----------35-----------
25DESCRIPTION36DESCRIPTION
2637
=== modified file 'docs/libmemcached.rst'
--- docs/libmemcached.rst 2011-04-19 22:43:26 +0000
+++ docs/libmemcached.rst 2011-06-01 06:29:28 +0000
@@ -10,6 +10,8 @@
1010
11Compile and link with -lmemcached11Compile and link with -lmemcached
1212
13=======
14
13libMemcached is an open source C/C++ client library and tools for the memcached server (http://danga.com/memcached). It has been designed to be light on memory usage, thread safe, and provide full access to server side methods.15libMemcached is an open source C/C++ client library and tools for the memcached server (http://danga.com/memcached). It has been designed to be light on memory usage, thread safe, and provide full access to server side methods.
1416
15libMemcached was designed to provide the greatest number of options to use Memcached. Some of the features provided:17libMemcached was designed to provide the greatest number of options to use Memcached. Some of the features provided:
1618
=== added file 'docs/memcached_return_t.rst'
--- docs/memcached_return_t.rst 1970-01-01 00:00:00 +0000
+++ docs/memcached_return_t.rst 2011-06-01 06:29:28 +0000
@@ -0,0 +1,129 @@
1================================
2Error Codes (memcached_return_t)
3================================
4
5--------
6SYNOPSIS
7--------
8
9#include <libmemcached/memcached.h>
10
11.. c:type:: memcached_return_t
12
13.. c:function:: const char *libmemcached_strerror(libmemcached_return_t rc)
14
15.. c:function:: bool libmemcached_success(libmemcached_return_t rc)
16
17.. c:function:: bool libmemcached_failure(libmemcached_return_t rc)
18
19.. c:function:: bool libmemcache_continue(libmemcached_return_t rc)
20
21
22
23:c:func:`memcached_success()` return true if :c:type:`MEMCACHED_SUCCESS` tested true.
24
25:c:func:`memcached_failure()` return true if any value other then :c:type:`MEMCACHED_SUCCESS` was provided.
26
27
28
29
30.. c:type:: MEMCACHED_SUCCESS,
31
32.. c:type:: MEMCACHED_FAILURE,
33
34.. c:type:: MEMCACHED_HOST_LOOKUP_FAILURE, // getaddrinfo() only
35
36.. c:type:: MEMCACHED_CONNECTION_FAILURE, // DEPRECATED
37
38.. c:type:: MEMCACHED_CONNECTION_BIND_FAILURE, // DEPRECATED
39
40.. c:type:: MEMCACHED_WRITE_FAILURE,
41
42.. c:type:: MEMCACHED_READ_FAILURE,
43
44.. c:type:: MEMCACHED_UNKNOWN_READ_FAILURE,
45
46.. c:type:: MEMCACHED_PROTOCOL_ERROR,
47
48.. c:type:: MEMCACHED_CLIENT_ERROR,
49
50.. c:type:: MEMCACHED_SERVER_ERROR,
51
52.. c:type:: MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE, // DEPRECATED
53
54.. c:type:: MEMCACHED_DATA_EXISTS,
55
56.. c:type:: MEMCACHED_DATA_DOES_NOT_EXIST,
57
58.. c:type:: MEMCACHED_NOTSTORED,
59
60.. c:type:: MEMCACHED_STORED,
61
62.. c:type:: MEMCACHED_NOTFOUND,
63
64.. c:type:: MEMCACHED_MEMORY_ALLOCATION_FAILURE,
65
66.. c:type:: MEMCACHED_PARTIAL_READ,
67
68.. c:type:: MEMCACHED_SOME_ERRORS,
69
70.. c:type:: MEMCACHED_NO_SERVERS,
71
72.. c:type:: MEMCACHED_END,
73
74.. c:type:: MEMCACHED_DELETED,
75
76.. c:type:: MEMCACHED_VALUE,
77
78.. c:type:: MEMCACHED_STAT,
79
80.. c:type:: MEMCACHED_ITEM,
81
82.. c:type:: MEMCACHED_ERRNO,
83
84.. c:type:: MEMCACHED_FAIL_UNIX_SOCKET, // DEPRECATED
85
86.. c:type:: MEMCACHED_NOT_SUPPORTED,
87
88.. c:type:: MEMCACHED_NO_KEY_PROVIDED, /* Deprecated. Use MEMCACHED_BAD_KEY_PROVIDED! */
89
90.. c:type:: MEMCACHED_FETCH_NOTFINISHED,
91
92.. c:type:: MEMCACHED_TIMEOUT,
93
94.. c:type:: MEMCACHED_BUFFERED,
95
96.. c:type:: MEMCACHED_BAD_KEY_PROVIDED,
97
98.. c:type:: MEMCACHED_INVALID_HOST_PROTOCOL,
99
100.. c:type:: MEMCACHED_SERVER_MARKED_DEAD,
101
102.. c:type:: MEMCACHED_UNKNOWN_STAT_KEY,
103
104.. c:type:: MEMCACHED_E2BIG,
105
106.. c:type:: MEMCACHED_INVALID_ARGUMENTS,
107
108.. c:type:: MEMCACHED_KEY_TOO_BIG,
109
110.. c:type:: MEMCACHED_AUTH_PROBLEM,
111
112.. c:type:: MEMCACHED_AUTH_FAILURE,
113
114.. c:type:: MEMCACHED_AUTH_CONTINUE,
115
116.. c:type:: MEMCACHED_PARSE_ERROR,
117
118.. c:type:: MEMCACHED_PARSE_USER_ERROR,
119
120.. c:type:: MEMCACHED_DEPRECATED,
121
122.. c:type:: MEMCACHED_MAXIMUM_RETURN /* Always add new error code before */
123
124--------
125SEE ALSO
126--------
127
128:manpage:`memcached(8)` :manpage:`libmemcached(3)` :manpage:`memcached_client_error()` or :manpage:`memcached_worker_error()`
129
0130
=== modified file 'docs/memcached_set.rst'
--- docs/memcached_set.rst 2011-05-24 01:36:22 +0000
+++ docs/memcached_set.rst 2011-06-01 06:29:28 +0000
@@ -34,10 +34,10 @@
3434
35memcached_set(), memcached_add(), and memcached_replace() are all used to35memcached_set(), memcached_add(), and memcached_replace() are all used to
36store information on the server. All methods take a key, and its length to36store information on the server. All methods take a key, and its length to
37store the object. Keys are currently limited to 250 characters when using either a version of memcached(1) which is 1.4 or below, or when using the text protocol.37store the object. Keys are currently limited to 250 characters when using either a version of memcached(1) which is 1.4 or below, or when using the text protocol. You must supply both a value and a length. Optionally you
38You must supply both a value and a length. Optionally you38store the object. Keys are currently limited to 250 characters by the
39may test an expiration time for the object and a 16 byte value (it is39memcached(1) server. You must supply both a value and a length. Optionally you
40meant to be used as a bitmap). "flags" is a 4byte space that is stored alongside of the main value. Many sub libraries make use of this field, so in most cases users should avoid making use of it.40may test an expiration time for the object and a 16 byte value (it is meant to be used as a bitmap). "flags" is a 4byte space that is stored alongside of the main value. Many sub libraries make use of this field, so in most cases users should avoid making use of it.
4141
42memcached_set() will write an object to the server. If an object already42memcached_set() will write an object to the server. If an object already
43exists it will overwrite what is in the server. If the object does not exist43exists it will overwrite what is in the server. If the object does not exist

Subscribers

People subscribed via source and target branches

to all changes: