projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in updates to make sure exit/return is done properly.
[awesomized/libmemcached]
/
clients
/
execute.c
diff --git
a/clients/execute.c
b/clients/execute.c
index daede9ec583edb4101a3cca5fd5db4cb52b0ff6b..dbc102c68af0f062501dfead9e98e9c6be6fb49b 100644
(file)
--- a/
clients/execute.c
+++ b/
clients/execute.c
@@
-14,8
+14,7
@@
Return the number of rows set.
*/
Return the number of rows set.
*/
-#include "libmemcached/common.h"
-
+#include "config.h"
#include "execute.h"
unsigned int execute_set(memcached_st *memc, pairs_st *pairs, unsigned int number_of)
#include "execute.h"
unsigned int execute_set(memcached_st *memc, pairs_st *pairs, unsigned int number_of)
@@
-108,17
+107,16
@@
unsigned int execute_mget(memcached_st *memc,
rc= memcached_mget_execute(memc, keys, key_length,
(size_t)number_of, callbacks, &retrieved, 1);
rc= memcached_mget_execute(memc, keys, key_length,
(size_t)number_of, callbacks, &retrieved, 1);
-
likely
(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_NOTFOUND ||
+
if
(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_NOTFOUND ||
rc == MEMCACHED_BUFFERED || rc == MEMCACHED_END)
{
rc= memcached_fetch_execute(memc, callbacks, (void *)&retrieved, 1);
rc == MEMCACHED_BUFFERED || rc == MEMCACHED_END)
{
rc= memcached_fetch_execute(memc, callbacks, (void *)&retrieved, 1);
- unlikely (rc != MEMCACHED_SUCCESS && rc != MEMCACHED_NOTFOUND &&
- rc != MEMCACHED_END)
+ if (rc != MEMCACHED_SUCCESS && rc != MEMCACHED_NOTFOUND && rc != MEMCACHED_END)
{
fprintf(stderr, "Failed to execute mget: %s\n",
memcached_strerror(memc, rc));
memcached_quit(memc);
{
fprintf(stderr, "Failed to execute mget: %s\n",
memcached_strerror(memc, rc));
memcached_quit(memc);
- return
0
;
+ return
EXIT_SUCCESS
;
}
}
else
}
}
else
@@
-126,7
+124,7
@@
unsigned int execute_mget(memcached_st *memc,
fprintf(stderr, "Failed to execute mget: %s\n",
memcached_strerror(memc, rc));
memcached_quit(memc);
fprintf(stderr, "Failed to execute mget: %s\n",
memcached_strerror(memc, rc));
memcached_quit(memc);
- return
0
;
+ return
EXIT_SUCCESS
;
}
return retrieved;
}
return retrieved;