projects
/
m6w6
/
libmemcached
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (from parent 1:
df195ef
)
Merge in changes for ICC fix.
author
Brian Aker
<brian@gaz>
Tue, 29 Jun 2010 06:39:40 +0000
(23:39 -0700)
committer
Brian Aker
<brian@gaz>
Tue, 29 Jun 2010 06:39:40 +0000
(23:39 -0700)
12 files changed:
clients/execute.c
patch
|
blob
|
history
clients/execute.h
patch
|
blob
|
history
clients/generator.c
patch
|
blob
|
history
clients/memcat.c
patch
|
blob
|
history
clients/memcp.c
patch
|
blob
|
history
clients/memdump.c
patch
|
blob
|
history
clients/memerror.c
patch
|
blob
|
history
clients/memflush.c
patch
|
blob
|
history
clients/memrm.c
patch
|
blob
|
history
clients/memstat.c
patch
|
blob
|
history
clients/utilities.c
patch
|
blob
|
history
clients/utilities.h
patch
|
blob
|
history
diff --git
a/clients/execute.c
b/clients/execute.c
index daede9ec583edb4101a3cca5fd5db4cb52b0ff6b..0beaae4bd85229208b704568dac68f854ca435f2 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,12
+107,11
@@
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));
{
fprintf(stderr, "Failed to execute mget: %s\n",
memcached_strerror(memc, rc));
diff --git
a/clients/execute.h
b/clients/execute.h
index ba54d8d2947294eff86dfb2e79088ad4ee7dbb12..176c6fff81d6ebe82aaafc318a1f92538ddae927 100644
(file)
--- a/
clients/execute.h
+++ b/
clients/execute.h
@@
-11,6
+11,9
@@
#ifndef CLIENTS_EXECUTE_H
#define CLIENTS_EXECUTE_H
#ifndef CLIENTS_EXECUTE_H
#define CLIENTS_EXECUTE_H
+
+#include <stdio.h>
+
#include "libmemcached/memcached.h"
#include "generator.h"
#include "libmemcached/memcached.h"
#include "generator.h"
diff --git
a/clients/generator.c
b/clients/generator.c
index 6e2f27953a5d48c50f88e3a8eb548240c64a386f..80b398b251df3a73b0f476f0439a91553f8951b1 100644
(file)
--- a/
clients/generator.c
+++ b/
clients/generator.c
@@
-9,7
+9,7
@@
*
*/
*
*/
-#include "
libmemcached/common
.h"
+#include "
config
.h"
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
diff --git
a/clients/memcat.c
b/clients/memcat.c
index d0a6b38faf769e8e2a3c87b11d7c0a524f850555..f50b069dc53844095fe6a4c17a188eaafca8fb62 100644
(file)
--- a/
clients/memcat.c
+++ b/
clients/memcat.c
@@
-9,7
+9,8
@@
*
*/
*
*/
-#include "libmemcached/common.h"
+#include "config.h"
+
#include <stdio.h>
#include <inttypes.h>
#include <string.h>
#include <stdio.h>
#include <inttypes.h>
#include <string.h>
diff --git
a/clients/memcp.c
b/clients/memcp.c
index 1dc30631900eed71032fa4424c6201eceed8b9b0..df3ca77e315e46fa205955fcd880c11eee697af3 100644
(file)
--- a/
clients/memcp.c
+++ b/
clients/memcp.c
@@
-9,7
+9,8
@@
*
*/
*
*/
-#include "libmemcached/common.h"
+#include "config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <inttypes.h>
@@
-54,7
+55,7
@@
static long strtol_wrapper(const char *nptr, int base, bool *error)
/* Check for various possible errors */
/* Check for various possible errors */
- if ((errno == ERANGE && (val ==
LONG_MAX || val == LONG
_MIN))
+ if ((errno == ERANGE && (val ==
INTMAX_MAX || val == INTMAX
_MIN))
|| (errno != 0 && val == 0))
{
*error= true;
|| (errno != 0 && val == 0))
{
*error= true;
diff --git
a/clients/memdump.c
b/clients/memdump.c
index 40ab430a4ceca1a0b339569068c02b1b2173217e..3654be2b0d3a9f529b15e83cdfcf0a764be85845 100644
(file)
--- a/
clients/memdump.c
+++ b/
clients/memdump.c
@@
-9,7
+9,8
@@
*
*/
*
*/
-#include "libmemcached/common.h"
+#include "config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <inttypes.h>
diff --git
a/clients/memerror.c
b/clients/memerror.c
index 286ef0e142b6630193b6a96b88032268d8bc6ea9..1ac091186f67f57436ce0041f1bc4226c2274675 100644
(file)
--- a/
clients/memerror.c
+++ b/
clients/memerror.c
@@
-8,8
+8,8
@@
* Summary:
*
*/
* Summary:
*
*/
+#include "config.h"
-#include "libmemcached/common.h"
#include <stdio.h>
#include <inttypes.h>
#include <string.h>
#include <stdio.h>
#include <inttypes.h>
#include <string.h>
diff --git
a/clients/memflush.c
b/clients/memflush.c
index 4cce8cb0b0fb49d150a61f1018fe238f5395de8a..9f2b57c65ff9ba2fff11ba793a1b31d274316f64 100644
(file)
--- a/
clients/memflush.c
+++ b/
clients/memflush.c
@@
-8,8
+8,8
@@
* Summary:
*
*/
* Summary:
*
*/
+#include "config.h"
-#include "libmemcached/common.h"
#include <stdio.h>
#include <unistd.h>
#include <string.h>
#include <stdio.h>
#include <unistd.h>
#include <string.h>
diff --git
a/clients/memrm.c
b/clients/memrm.c
index dfb2c2fbe00a074b01086ee65ca41f91e03c84df..c5637608786f0a886182a11d9e26a5c366ed5e42 100644
(file)
--- a/
clients/memrm.c
+++ b/
clients/memrm.c
@@
-8,8
+8,8
@@
* Summary:
*
*/
* Summary:
*
*/
+#include "config.h"
-#include "libmemcached/common.h"
#include <stdio.h>
#include <unistd.h>
#include <getopt.h>
#include <stdio.h>
#include <unistd.h>
#include <getopt.h>
diff --git
a/clients/memstat.c
b/clients/memstat.c
index db96364e7dcffbd91d35f7bef1f2649c63694396..510cb359937e5702ed2721ca988d234df50ae2a0 100644
(file)
--- a/
clients/memstat.c
+++ b/
clients/memstat.c
@@
-11,8
+11,8
@@
* Brian Aker
* Toru Maesaka
*/
* Brian Aker
* Toru Maesaka
*/
+#include "config.h"
-#include "libmemcached/common.h"
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git
a/clients/utilities.c
b/clients/utilities.c
index 6353ff6b97e8b0894195c4b44353bb451613a044..de2bdf442eba9a866c84485b36b060d12598216a 100644
(file)
--- a/
clients/utilities.c
+++ b/
clients/utilities.c
@@
-8,8
+8,8
@@
* Summary:
*
*/
* Summary:
*
*/
+#include "config.h"
-#include "libmemcached/common.h"
#include <stdio.h>
#include <ctype.h>
#include <string.h>
#include <stdio.h>
#include <ctype.h>
#include <string.h>
diff --git
a/clients/utilities.h
b/clients/utilities.h
index 162366ab82d48403cbb11dc1b92c9254b56d0719..f74626480028cade60eb37128ac6c8ef3c5715dc 100644
(file)
--- a/
clients/utilities.h
+++ b/
clients/utilities.h
@@
-11,6
+11,7
@@
#include <getopt.h>
#include <libmemcached/memcached.h>
#include <getopt.h>
#include <libmemcached/memcached.h>
+#include "libmemcached/watchpoint.h"
#include "client_options.h"
#if TIME_WITH_SYS_TIME
#include "client_options.h"
#if TIME_WITH_SYS_TIME