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
1=== modified file 'docs/hashkit_create.rst'
2--- docs/hashkit_create.rst 2011-05-24 01:36:22 +0000
3+++ docs/hashkit_create.rst 2011-06-01 06:29:28 +0000
4@@ -19,7 +19,18 @@
5 .. c:function:: bool hashkit_is_allocated(const hashkit_st *hash);
6
7 Compile and link with -lhashkit
8-
9+=======
10+
11+
12+.. c:function:: perl
13+
14+.. c:function:: hashkit_st *hashkit_create(hashkit_st *hash);
15+
16+.. c:function:: hashkit_st *hashkit_clone(hashkit_st *destination, const hashkit_st *ptr);
17+
18+.. c:function:: void hashkit_free(hashkit_st *hash);
19+
20+.. c:function:: bool hashkit_is_allocated(const hashkit_st *hash);
21
22 -----------
23 DESCRIPTION
24
25=== modified file 'docs/libmemcached.rst'
26--- docs/libmemcached.rst 2011-04-19 22:43:26 +0000
27+++ docs/libmemcached.rst 2011-06-01 06:29:28 +0000
28@@ -10,6 +10,8 @@
29
30 Compile and link with -lmemcached
31
32+=======
33+
34 libMemcached 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.
35
36 libMemcached was designed to provide the greatest number of options to use Memcached. Some of the features provided:
37
38=== added file 'docs/memcached_return_t.rst'
39--- docs/memcached_return_t.rst 1970-01-01 00:00:00 +0000
40+++ docs/memcached_return_t.rst 2011-06-01 06:29:28 +0000
41@@ -0,0 +1,129 @@
42+================================
43+Error Codes (memcached_return_t)
44+================================
45+
46+--------
47+SYNOPSIS
48+--------
49+
50+#include <libmemcached/memcached.h>
51+
52+.. c:type:: memcached_return_t
53+
54+.. c:function:: const char *libmemcached_strerror(libmemcached_return_t rc)
55+
56+.. c:function:: bool libmemcached_success(libmemcached_return_t rc)
57+
58+.. c:function:: bool libmemcached_failure(libmemcached_return_t rc)
59+
60+.. c:function:: bool libmemcache_continue(libmemcached_return_t rc)
61+
62+
63+
64+:c:func:`memcached_success()` return true if :c:type:`MEMCACHED_SUCCESS` tested true.
65+
66+:c:func:`memcached_failure()` return true if any value other then :c:type:`MEMCACHED_SUCCESS` was provided.
67+
68+
69+
70+
71+.. c:type:: MEMCACHED_SUCCESS,
72+
73+.. c:type:: MEMCACHED_FAILURE,
74+
75+.. c:type:: MEMCACHED_HOST_LOOKUP_FAILURE, // getaddrinfo() only
76+
77+.. c:type:: MEMCACHED_CONNECTION_FAILURE, // DEPRECATED
78+
79+.. c:type:: MEMCACHED_CONNECTION_BIND_FAILURE, // DEPRECATED
80+
81+.. c:type:: MEMCACHED_WRITE_FAILURE,
82+
83+.. c:type:: MEMCACHED_READ_FAILURE,
84+
85+.. c:type:: MEMCACHED_UNKNOWN_READ_FAILURE,
86+
87+.. c:type:: MEMCACHED_PROTOCOL_ERROR,
88+
89+.. c:type:: MEMCACHED_CLIENT_ERROR,
90+
91+.. c:type:: MEMCACHED_SERVER_ERROR,
92+
93+.. c:type:: MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE, // DEPRECATED
94+
95+.. c:type:: MEMCACHED_DATA_EXISTS,
96+
97+.. c:type:: MEMCACHED_DATA_DOES_NOT_EXIST,
98+
99+.. c:type:: MEMCACHED_NOTSTORED,
100+
101+.. c:type:: MEMCACHED_STORED,
102+
103+.. c:type:: MEMCACHED_NOTFOUND,
104+
105+.. c:type:: MEMCACHED_MEMORY_ALLOCATION_FAILURE,
106+
107+.. c:type:: MEMCACHED_PARTIAL_READ,
108+
109+.. c:type:: MEMCACHED_SOME_ERRORS,
110+
111+.. c:type:: MEMCACHED_NO_SERVERS,
112+
113+.. c:type:: MEMCACHED_END,
114+
115+.. c:type:: MEMCACHED_DELETED,
116+
117+.. c:type:: MEMCACHED_VALUE,
118+
119+.. c:type:: MEMCACHED_STAT,
120+
121+.. c:type:: MEMCACHED_ITEM,
122+
123+.. c:type:: MEMCACHED_ERRNO,
124+
125+.. c:type:: MEMCACHED_FAIL_UNIX_SOCKET, // DEPRECATED
126+
127+.. c:type:: MEMCACHED_NOT_SUPPORTED,
128+
129+.. c:type:: MEMCACHED_NO_KEY_PROVIDED, /* Deprecated. Use MEMCACHED_BAD_KEY_PROVIDED! */
130+
131+.. c:type:: MEMCACHED_FETCH_NOTFINISHED,
132+
133+.. c:type:: MEMCACHED_TIMEOUT,
134+
135+.. c:type:: MEMCACHED_BUFFERED,
136+
137+.. c:type:: MEMCACHED_BAD_KEY_PROVIDED,
138+
139+.. c:type:: MEMCACHED_INVALID_HOST_PROTOCOL,
140+
141+.. c:type:: MEMCACHED_SERVER_MARKED_DEAD,
142+
143+.. c:type:: MEMCACHED_UNKNOWN_STAT_KEY,
144+
145+.. c:type:: MEMCACHED_E2BIG,
146+
147+.. c:type:: MEMCACHED_INVALID_ARGUMENTS,
148+
149+.. c:type:: MEMCACHED_KEY_TOO_BIG,
150+
151+.. c:type:: MEMCACHED_AUTH_PROBLEM,
152+
153+.. c:type:: MEMCACHED_AUTH_FAILURE,
154+
155+.. c:type:: MEMCACHED_AUTH_CONTINUE,
156+
157+.. c:type:: MEMCACHED_PARSE_ERROR,
158+
159+.. c:type:: MEMCACHED_PARSE_USER_ERROR,
160+
161+.. c:type:: MEMCACHED_DEPRECATED,
162+
163+.. c:type:: MEMCACHED_MAXIMUM_RETURN /* Always add new error code before */
164+
165+--------
166+SEE ALSO
167+--------
168+
169+:manpage:`memcached(8)` :manpage:`libmemcached(3)` :manpage:`memcached_client_error()` or :manpage:`memcached_worker_error()`
170+
171
172=== modified file 'docs/memcached_set.rst'
173--- docs/memcached_set.rst 2011-05-24 01:36:22 +0000
174+++ docs/memcached_set.rst 2011-06-01 06:29:28 +0000
175@@ -34,10 +34,10 @@
176
177 memcached_set(), memcached_add(), and memcached_replace() are all used to
178 store information on the server. All methods take a key, and its length to
179-store 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.
180-You must supply both a value and a length. Optionally you
181-may test an expiration time for the object and a 16 byte value (it is
182-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.
183+store 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
184+store the object. Keys are currently limited to 250 characters by the
185+memcached(1) server. You must supply both a value and a length. Optionally you
186+may 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.
187
188 memcached_set() will write an object to the server. If an object already
189 exists 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: