projects
/
awesomized
/
libmemcached
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
75eb812
)
Fixed -Wwrite-strings warnings.
author
Monty Taylor
<mordred@inaugust.com>
Wed, 8 Jul 2009 13:38:34 +0000
(13:38 +0000)
committer
Monty Taylor
<mordred@inaugust.com>
Wed, 8 Jul 2009 13:38:34 +0000
(13:38 +0000)
24 files changed:
clients/memcp.c
patch
|
blob
|
history
clients/utilities.c
patch
|
blob
|
history
clients/utilities.h
patch
|
blob
|
history
libmemcached/common.h
patch
|
blob
|
history
libmemcached/memcached.h
patch
|
blob
|
history
libmemcached/memcached.hh
patch
|
blob
|
history
libmemcached/memcached_auto.c
patch
|
blob
|
history
libmemcached/memcached_callback.c
patch
|
blob
|
history
libmemcached/memcached_get.c
patch
|
blob
|
history
libmemcached/memcached_get.h
patch
|
blob
|
history
libmemcached/memcached_key.c
patch
|
blob
|
history
libmemcached/memcached_result.c
patch
|
blob
|
history
libmemcached/memcached_result.h
patch
|
blob
|
history
libmemcached/memcached_server.c
patch
|
blob
|
history
libmemcached/memcached_stats.c
patch
|
blob
|
history
libmemcached/memcached_storage.c
patch
|
blob
|
history
libmemcached/memcached_strerror.c
patch
|
blob
|
history
libmemcached/memcached_string.c
patch
|
blob
|
history
libmemcached/memcached_string.h
patch
|
blob
|
history
libmemcached/memcached_version.c
patch
|
blob
|
history
tests/atomsmasher.c
patch
|
blob
|
history
tests/function.c
patch
|
blob
|
history
tests/ketama_test_cases.h
patch
|
blob
|
history
tests/udp.c
patch
|
blob
|
history
diff --git
a/clients/memcp.c
b/clients/memcp.c
index d6864b1ad2dd18405419bb121cf779dafcdf25c8..778beaf783c10298201666453d86ed34ea698ba0 100644
(file)
--- a/
clients/memcp.c
+++ b/
clients/memcp.c
@@
-91,7
+91,7
@@
int main(int argc, char *argv[])
if (opt_verbose)
{
if (opt_verbose)
{
- static char *opstr[] = { "set", "add", "replace" };
+ static c
onst c
har *opstr[] = { "set", "add", "replace" };
printf("op: %s\nsource file: %s\nlength: %zu\n"
"key: %s\nflags: %x\nexpires: %llu\n",
opstr[opt_method - OPT_SET], argv[optind], (size_t)sbuf.st_size,
printf("op: %s\nsource file: %s\nlength: %zu\n"
"key: %s\nflags: %x\nexpires: %llu\n",
opstr[opt_method - OPT_SET], argv[optind], (size_t)sbuf.st_size,
diff --git
a/clients/utilities.c
b/clients/utilities.c
index 6551684db003f26c0497c80d149d0da1f6f04b3e..9ad6edcf90789310dea7d3c4da3abcc8dbb45ac1 100644
(file)
--- a/
clients/utilities.c
+++ b/
clients/utilities.c
@@
-16,13
+16,13
@@
long int timedif(struct timeval a, struct timeval b)
return s + us;
}
return s + us;
}
-void version_command(char *command_name)
+void version_command(c
onst c
har *command_name)
{
printf("%s v%u.%u\n", command_name, 1, 0);
exit(0);
}
{
printf("%s v%u.%u\n", command_name, 1, 0);
exit(0);
}
-static char *lookup_help(memcached_options option)
+static c
onst c
har *lookup_help(memcached_options option)
{
switch (option)
{
{
switch (option)
{
@@
-54,7
+54,7
@@
static char *lookup_help(memcached_options option)
return "forgot to document this function :)";
}
return "forgot to document this function :)";
}
-void help_command(c
har *command_name,
char *description,
+void help_command(c
onst char *command_name, const
char *description,
const struct option *long_options,
memcached_programs_help_st *options __attribute__((unused)))
{
const struct option *long_options,
memcached_programs_help_st *options __attribute__((unused)))
{
@@
-66,7
+66,7
@@
void help_command(char *command_name, char *description,
for (x= 0; long_options[x].name; x++)
{
for (x= 0; long_options[x].name; x++)
{
- char *help_message;
+ c
onst c
har *help_message;
printf("\t --%s%c\n", long_options[x].name,
long_options[x].has_arg ? '=' : ' ');
printf("\t --%s%c\n", long_options[x].name,
long_options[x].has_arg ? '=' : ' ');
diff --git
a/clients/utilities.h
b/clients/utilities.h
index ea0be2ea42234ab55ea7b09c3b320e939001ee79..af6706135b84a19232b4162ee1e542d0d0188f3f 100644
(file)
--- a/
clients/utilities.h
+++ b/
clients/utilities.h
@@
-23,8
+23,8
@@
struct memcached_programs_help_st
char *strdup_cleanup(const char *str);
void cleanup(void);
long int timedif(struct timeval a, struct timeval b);
char *strdup_cleanup(const char *str);
void cleanup(void);
long int timedif(struct timeval a, struct timeval b);
-void version_command(char *command_name);
-void help_command(c
har *command_name,
char *description,
+void version_command(c
onst c
har *command_name);
+void help_command(c
onst char *command_name, const
char *description,
const struct option *long_options,
memcached_programs_help_st *options);
void process_hash_option(memcached_st *memc, char *opt_hash);
const struct option *long_options,
memcached_programs_help_st *options);
void process_hash_option(memcached_st *memc, char *opt_hash);
diff --git
a/libmemcached/common.h
b/libmemcached/common.h
index d8371d18dfa69d89adbbd5561ea198472bdfd0ba..7942b27a34011bf96d18887779754a6f78c47866 100644
(file)
--- a/
libmemcached/common.h
+++ b/
libmemcached/common.h
@@
-135,7
+135,7
@@
LIBMEMCACHED_LOCAL
void server_list_free(memcached_st *ptr, memcached_server_st *servers);
LIBMEMCACHED_LOCAL
void server_list_free(memcached_st *ptr, memcached_server_st *servers);
LIBMEMCACHED_LOCAL
-memcached_return memcached_key_test(char **keys, size_t *key_length,
+memcached_return memcached_key_test(c
onst c
har **keys, size_t *key_length,
unsigned int number_of_keys);
unsigned int number_of_keys);
diff --git
a/libmemcached/memcached.h
b/libmemcached/memcached.h
index c260211630e2c62593b7a0009cdf6b0d66928ccc..1293eefbbe1db6db97a331fb6c497906ce58d3de 100644
(file)
--- a/
libmemcached/memcached.h
+++ b/
libmemcached/memcached.h
@@
-172,7
+172,7
@@
memcached_return memcached_verbosity(memcached_st *ptr, unsigned int verbosity);
LIBMEMCACHED_API
void memcached_quit(memcached_st *ptr);
LIBMEMCACHED_API
LIBMEMCACHED_API
void memcached_quit(memcached_st *ptr);
LIBMEMCACHED_API
-char *memcached_strerror(memcached_st *ptr, memcached_return rc);
+c
onst c
har *memcached_strerror(memcached_st *ptr, memcached_return rc);
LIBMEMCACHED_API
memcached_return memcached_behavior_set(memcached_st *ptr, memcached_behavior flag, uint64_t data);
LIBMEMCACHED_API
LIBMEMCACHED_API
memcached_return memcached_behavior_set(memcached_st *ptr, memcached_behavior flag, uint64_t data);
LIBMEMCACHED_API
diff --git
a/libmemcached/memcached.hh
b/libmemcached/memcached.hh
index 2f2d519e094a52493803400f11894614173ea861..d13ca23a7c0217d3811bac7a5e60536c193f02a4 100644
(file)
--- a/
libmemcached/memcached.hh
+++ b/
libmemcached/memcached.hh
@@
-46,7
+46,7
@@
public:
value_length, &flags, &rc);
}
value_length, &flags, &rc);
}
- memcached_return mget(char **keys, size_t *key_length,
+ memcached_return mget(c
onst c
har **keys, size_t *key_length,
unsigned int number_of_keys)
{
unsigned int number_of_keys)
{
diff --git
a/libmemcached/memcached_auto.c
b/libmemcached/memcached_auto.c
index 2cb810db19f9df6ae844a6aecbf5938129fe6551..176cbcc908e3c3179beb73e2845d773662210891 100644
(file)
--- a/
libmemcached/memcached_auto.c
+++ b/
libmemcached/memcached_auto.c
@@
-15,7
+15,7
@@
static memcached_return memcached_auto(memcached_st *ptr,
unlikely (ptr->hosts == NULL || ptr->number_of_hosts == 0)
return MEMCACHED_NO_SERVERS;
unlikely (ptr->hosts == NULL || ptr->number_of_hosts == 0)
return MEMCACHED_NO_SERVERS;
- if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
+ if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test((c
onst c
har **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
return MEMCACHED_BAD_KEY_PROVIDED;
server_key= memcached_generate_hash(ptr, key, key_length);
return MEMCACHED_BAD_KEY_PROVIDED;
server_key= memcached_generate_hash(ptr, key, key_length);
diff --git
a/libmemcached/memcached_callback.c
b/libmemcached/memcached_callback.c
index 3433585cec331ed323e204bd48ce396f4f94a9a8..ea59f84453749356ecd01de10190fedaf99234ea 100644
(file)
--- a/
libmemcached/memcached_callback.c
+++ b/
libmemcached/memcached_callback.c
@@
-21,7
+21,7
@@
memcached_return memcached_callback_set(memcached_st *ptr,
{
size_t key_length= strlen(key);
{
size_t key_length= strlen(key);
- if (memcached_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED)
+ if (memcached_key_test((c
onst c
har **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED)
{
return MEMCACHED_BAD_KEY_PROVIDED;
}
{
return MEMCACHED_BAD_KEY_PROVIDED;
}
diff --git
a/libmemcached/memcached_get.c
b/libmemcached/memcached_get.c
index e91db4cf363854f3aa363691c23ece90b274c8ac..b7e900053027f1c72fd7c98b77fe11d74007727a 100644
(file)
--- a/
libmemcached/memcached_get.c
+++ b/
libmemcached/memcached_get.c
@@
-37,7
+37,7
@@
char *memcached_get_by_key(memcached_st *ptr,
*error= memcached_mget_by_key(ptr,
master_key,
master_key_length,
*error= memcached_mget_by_key(ptr,
master_key,
master_key_length,
- (char **)&key, &key_length, 1);
+ (c
onst c
har **)&key, &key_length, 1);
value= memcached_fetch(ptr, NULL, NULL,
value_length, flags, error);
value= memcached_fetch(ptr, NULL, NULL,
value_length, flags, error);
@@
-102,7
+102,7
@@
char *memcached_get_by_key(memcached_st *ptr,
}
memcached_return memcached_mget(memcached_st *ptr,
}
memcached_return memcached_mget(memcached_st *ptr,
- char **keys, size_t *key_length,
+ c
onst c
har **keys, size_t *key_length,
unsigned int number_of_keys)
{
return memcached_mget_by_key(ptr, NULL, 0, keys, key_length, number_of_keys);
unsigned int number_of_keys)
{
return memcached_mget_by_key(ptr, NULL, 0, keys, key_length, number_of_keys);
@@
-111,19
+111,19
@@
memcached_return memcached_mget(memcached_st *ptr,
static memcached_return binary_mget_by_key(memcached_st *ptr,
unsigned int master_server_key,
bool is_master_key_set,
static memcached_return binary_mget_by_key(memcached_st *ptr,
unsigned int master_server_key,
bool is_master_key_set,
- char **keys, size_t *key_length,
+ c
onst c
har **keys, size_t *key_length,
unsigned int number_of_keys);
memcached_return memcached_mget_by_key(memcached_st *ptr,
const char *master_key,
size_t master_key_length,
unsigned int number_of_keys);
memcached_return memcached_mget_by_key(memcached_st *ptr,
const char *master_key,
size_t master_key_length,
- char **keys,
+ c
onst c
har **keys,
size_t *key_length,
unsigned int number_of_keys)
{
unsigned int x;
memcached_return rc= MEMCACHED_NOTFOUND;
size_t *key_length,
unsigned int number_of_keys)
{
unsigned int x;
memcached_return rc= MEMCACHED_NOTFOUND;
- char *get_command= "get ";
+ c
onst c
har *get_command= "get ";
uint8_t get_command_length= 4;
unsigned int master_server_key= (unsigned int)-1; /* 0 is a valid server id! */
bool is_master_key_set= false;
uint8_t get_command_length= 4;
unsigned int master_server_key= (unsigned int)-1; /* 0 is a valid server id! */
bool is_master_key_set= false;
@@
-145,7
+145,7
@@
memcached_return memcached_mget_by_key(memcached_st *ptr,
if (master_key && master_key_length)
{
if (master_key && master_key_length)
{
- if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test((char **)&master_key, &master_key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
+ if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test((c
onst c
har **)&master_key, &master_key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
return MEMCACHED_BAD_KEY_PROVIDED;
master_server_key= memcached_generate_hash(ptr, master_key, master_key_length);
is_master_key_set= true;
return MEMCACHED_BAD_KEY_PROVIDED;
master_server_key= memcached_generate_hash(ptr, master_key, master_key_length);
is_master_key_set= true;
@@
-259,7
+259,7
@@
memcached_return memcached_mget_by_key(memcached_st *ptr,
static memcached_return simple_binary_mget(memcached_st *ptr,
unsigned int master_server_key,
bool is_master_key_set,
static memcached_return simple_binary_mget(memcached_st *ptr,
unsigned int master_server_key,
bool is_master_key_set,
- char **keys, size_t *key_length,
+ c
onst c
har **keys, size_t *key_length,
unsigned int number_of_keys)
{
memcached_return rc= MEMCACHED_NOTFOUND;
unsigned int number_of_keys)
{
memcached_return rc= MEMCACHED_NOTFOUND;
@@
-360,7
+360,7
@@
static memcached_return simple_binary_mget(memcached_st *ptr,
static memcached_return replication_binary_mget(memcached_st *ptr,
uint32_t* hash, bool* dead_servers,
static memcached_return replication_binary_mget(memcached_st *ptr,
uint32_t* hash, bool* dead_servers,
- char **keys, size_t *key_length,
+ c
onst c
har **keys, size_t *key_length,
unsigned int number_of_keys)
{
memcached_return rc= MEMCACHED_NOTFOUND;
unsigned int number_of_keys)
{
memcached_return rc= MEMCACHED_NOTFOUND;
@@
-459,7
+459,7
@@
static memcached_return replication_binary_mget(memcached_st *ptr,
static memcached_return binary_mget_by_key(memcached_st *ptr,
unsigned int master_server_key,
bool is_master_key_set,
static memcached_return binary_mget_by_key(memcached_st *ptr,
unsigned int master_server_key,
bool is_master_key_set,
- char **keys, size_t *key_length,
+ c
onst c
har **keys, size_t *key_length,
unsigned int number_of_keys)
{
memcached_return rc;
unsigned int number_of_keys)
{
memcached_return rc;
diff --git
a/libmemcached/memcached_get.h
b/libmemcached/memcached_get.h
index dba3c919d9f0ec273888b8b81c6d248e02f7ded6..7044442798ee5f2334323053f0d786e968a5d41a 100644
(file)
--- a/
libmemcached/memcached_get.h
+++ b/
libmemcached/memcached_get.h
@@
-23,7
+23,7
@@
char *memcached_get(memcached_st *ptr,
LIBMEMCACHED_API
memcached_return memcached_mget(memcached_st *ptr,
LIBMEMCACHED_API
memcached_return memcached_mget(memcached_st *ptr,
- char **keys, size_t *key_length,
+ c
onst c
har **keys, size_t *key_length,
unsigned int number_of_keys);
LIBMEMCACHED_API
unsigned int number_of_keys);
LIBMEMCACHED_API
@@
-38,7
+38,7
@@
LIBMEMCACHED_API
memcached_return memcached_mget_by_key(memcached_st *ptr,
const char *master_key, size_t
master_key_length,
memcached_return memcached_mget_by_key(memcached_st *ptr,
const char *master_key, size_t
master_key_length,
- char **keys,
+ c
onst c
har **keys,
size_t *key_length,
unsigned int number_of_keys);
size_t *key_length,
unsigned int number_of_keys);
diff --git
a/libmemcached/memcached_key.c
b/libmemcached/memcached_key.c
index bbbd940dbee3c0add01ea38a9fdd69c8517afd7f..c992c338c7248a688197691db0024895b9d708d7 100644
(file)
--- a/
libmemcached/memcached_key.c
+++ b/
libmemcached/memcached_key.c
@@
-1,6
+1,6
@@
#include "common.h"
#include "common.h"
-memcached_return memcached_key_test(char **keys, size_t *key_length,
+memcached_return memcached_key_test(c
onst c
har **keys, size_t *key_length,
unsigned int number_of_keys)
{
uint32_t x;
unsigned int number_of_keys)
{
uint32_t x;
diff --git
a/libmemcached/memcached_result.c
b/libmemcached/memcached_result.c
index 1462b89c3ef42e446162e44842931800bfbfcba7..0d77130db58857a437089073e513afef97f00f47 100644
(file)
--- a/
libmemcached/memcached_result.c
+++ b/
libmemcached/memcached_result.c
@@
-40,7
+40,7
@@
void memcached_result_reset(memcached_result_st *ptr)
/*
NOTE turn into macro
*/
/*
NOTE turn into macro
*/
-memcached_return memcached_result_set_value(memcached_result_st *ptr, char *value, size_t length)
+memcached_return memcached_result_set_value(memcached_result_st *ptr, c
onst c
har *value, size_t length)
{
return memcached_string_append(&ptr->value, value, length);
}
{
return memcached_string_append(&ptr->value, value, length);
}
diff --git
a/libmemcached/memcached_result.h
b/libmemcached/memcached_result.h
index b06ea2ce2418384a4394d038175d9fd8d6884da8..e7ce012b3884e814e50b065c496b00b00c0e91b6 100644
(file)
--- a/
libmemcached/memcached_result.h
+++ b/
libmemcached/memcached_result.h
@@
-48,7
+48,7
@@
size_t memcached_result_length(memcached_result_st *ptr);
#define memcached_result_flags(A) (A)->flags
#define memcached_result_cas(A) (A)->cas
LIBMEMCACHED_API
#define memcached_result_flags(A) (A)->flags
#define memcached_result_cas(A) (A)->cas
LIBMEMCACHED_API
-memcached_return memcached_result_set_value(memcached_result_st *ptr, char *value, size_t length);
+memcached_return memcached_result_set_value(memcached_result_st *ptr, c
onst c
har *value, size_t length);
#define memcached_result_set_flags(A,B) (A)->flags=(B)
#define memcached_result_set_expiration(A,B) (A)->expiration=(B)
#define memcached_result_set_flags(A,B) (A)->flags=(B)
#define memcached_result_set_expiration(A,B) (A)->expiration=(B)
diff --git
a/libmemcached/memcached_server.c
b/libmemcached/memcached_server.c
index 04364f3a3d31bad4b0c5fe607c353c8acb980c55..11e5988a6f7b57f7161a4753da0e3bc70e224b57 100644
(file)
--- a/
libmemcached/memcached_server.c
+++ b/
libmemcached/memcached_server.c
@@
-120,7
+120,7
@@
memcached_server_st *memcached_server_by_key(memcached_st *ptr, const char *key
return NULL;
}
return NULL;
}
- if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
+ if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test((c
onst c
har **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
{
*error= MEMCACHED_BAD_KEY_PROVIDED;
return NULL;
{
*error= MEMCACHED_BAD_KEY_PROVIDED;
return NULL;
diff --git
a/libmemcached/memcached_stats.c
b/libmemcached/memcached_stats.c
index c7e1197b5dd8f64444711d11c913bbc2ce139a98..e64ca550bd143d10689c591a3d675a900b26341a 100644
(file)
--- a/
libmemcached/memcached_stats.c
+++ b/
libmemcached/memcached_stats.c
@@
-3,7
+3,7
@@
#include "common.h"
#include "common.h"
-static char *memcached_stat_keys[] = {
+static c
onst c
har *memcached_stat_keys[] = {
"pid",
"uptime",
"time",
"pid",
"uptime",
"time",
diff --git
a/libmemcached/memcached_storage.c
b/libmemcached/memcached_storage.c
index 53d79822ae633f5b7eabefd1eea55fc77bac4025..e10f85f0e0597b977663da098d90f64fd6af0c87 100644
(file)
--- a/
libmemcached/memcached_storage.c
+++ b/
libmemcached/memcached_storage.c
@@
-19,7
+19,7
@@
typedef enum {
} memcached_storage_action;
/* Inline this */
} memcached_storage_action;
/* Inline this */
-static char *storage_op_string(memcached_storage_action verb)
+static c
onst c
har *storage_op_string(memcached_storage_action verb)
{
switch (verb)
{
{
switch (verb)
{
@@
-79,7
+79,7
@@
static inline memcached_return memcached_send(memcached_st *ptr,
unlikely (ptr->number_of_hosts == 0)
return MEMCACHED_NO_SERVERS;
unlikely (ptr->number_of_hosts == 0)
return MEMCACHED_NO_SERVERS;
- if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
+ if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test((c
onst c
har **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
return MEMCACHED_BAD_KEY_PROVIDED;
if (ptr->flags & MEM_BINARY_PROTOCOL)
return MEMCACHED_BAD_KEY_PROVIDED;
if (ptr->flags & MEM_BINARY_PROTOCOL)
diff --git
a/libmemcached/memcached_strerror.c
b/libmemcached/memcached_strerror.c
index 47afdbda396bdaafac606e1c7566ebd5175f564c..8b75edd40be73ceb72488fef6ecfcbafe7b0b0b1 100644
(file)
--- a/
libmemcached/memcached_strerror.c
+++ b/
libmemcached/memcached_strerror.c
@@
-1,6
+1,6
@@
#include "common.h"
#include "common.h"
-char *memcached_strerror(memcached_st *ptr __attribute__((unused)), memcached_return rc)
+c
onst c
har *memcached_strerror(memcached_st *ptr __attribute__((unused)), memcached_return rc)
{
switch (rc)
{
{
switch (rc)
{
diff --git
a/libmemcached/memcached_string.c
b/libmemcached/memcached_string.c
index c190997b9d3a9273436e310e645805e722db9ac0..5b9e9281620e3e063bce34597e14765c0c397041 100644
(file)
--- a/
libmemcached/memcached_string.c
+++ b/
libmemcached/memcached_string.c
@@
-79,7
+79,7
@@
memcached_return memcached_string_append_character(memcached_string_st *string,
}
memcached_return memcached_string_append(memcached_string_st *string,
}
memcached_return memcached_string_append(memcached_string_st *string,
- char *value, size_t length)
+ c
onst c
har *value, size_t length)
{
memcached_return rc;
{
memcached_return rc;
diff --git
a/libmemcached/memcached_string.h
b/libmemcached/memcached_string.h
index 8f347cd8aaddce56a71ed482aa879fd68307261e..bed142811c217e51e72d9f881cc7b00876eb6f3f 100644
(file)
--- a/
libmemcached/memcached_string.h
+++ b/
libmemcached/memcached_string.h
@@
-40,7
+40,7
@@
memcached_return memcached_string_append_character(memcached_string_st *string,
char character);
LIBMEMCACHED_API
memcached_return memcached_string_append(memcached_string_st *string,
char character);
LIBMEMCACHED_API
memcached_return memcached_string_append(memcached_string_st *string,
- char *value, size_t length);
+ c
onst c
har *value, size_t length);
LIBMEMCACHED_API
memcached_return memcached_string_reset(memcached_string_st *string);
LIBMEMCACHED_API
LIBMEMCACHED_API
memcached_return memcached_string_reset(memcached_string_st *string);
LIBMEMCACHED_API
diff --git
a/libmemcached/memcached_version.c
b/libmemcached/memcached_version.c
index 30bcb1bd28554638681c45618036cd93d3b71048..9c070eaf2ec744339b3cb499050cacbf359cba3d 100644
(file)
--- a/
libmemcached/memcached_version.c
+++ b/
libmemcached/memcached_version.c
@@
-26,7
+26,7
@@
static inline memcached_return memcached_version_textual(memcached_st *ptr)
memcached_return rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
char *response_ptr;
memcached_return rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
char *response_ptr;
- char *command= "version\r\n";
+ c
onst c
har *command= "version\r\n";
send_length= strlen(command);
send_length= strlen(command);
diff --git
a/tests/atomsmasher.c
b/tests/atomsmasher.c
index eee08d6b724da3a4616e10e362b7a024f9e0d15e..3b4879df4bef1c1c260935867fbfbae4ad42f94f 100644
(file)
--- a/
tests/atomsmasher.c
+++ b/
tests/atomsmasher.c
@@
-156,8
+156,8
@@
static memcached_return enable_consistent(memcached_st *memc)
static test_return add_test(memcached_st *memc)
{
memcached_return rc;
static test_return add_test(memcached_st *memc)
{
memcached_return rc;
- char *key= "foo";
- char *value= "when we sanitize";
+ c
onst c
har *key= "foo";
+ c
onst c
har *value= "when we sanitize";
unsigned long long setting_value;
setting_value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NO_BLOCK);
unsigned long long setting_value;
setting_value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NO_BLOCK);
diff --git
a/tests/function.c
b/tests/function.c
index b806c883c3dabc8583bc711e991e2190cb24cc3d..b9e7d303efdbfa121fe44e357dc9b0f1b837a1e2 100644
(file)
--- a/
tests/function.c
+++ b/
tests/function.c
@@
-38,7
+38,7
@@
static uint32_t global_count;
static pairs_st *global_pairs;
static uint32_t global_count;
static pairs_st *global_pairs;
-static char *global_keys[GLOBAL_COUNT];
+static c
onst c
har *global_keys[GLOBAL_COUNT];
static size_t global_keys_length[GLOBAL_COUNT];
static test_return init_test(memcached_st *not_used __attribute__((unused)))
static size_t global_keys_length[GLOBAL_COUNT];
static test_return init_test(memcached_st *not_used __attribute__((unused)))
@@
-299,8
+299,8
@@
static test_return error_test(memcached_st *memc)
static test_return set_test(memcached_st *memc)
{
memcached_return rc;
static test_return set_test(memcached_st *memc)
{
memcached_return rc;
- char *key= "foo";
- char *value= "when we sanitize";
+ c
onst c
har *key= "foo";
+ c
onst c
har *value= "when we sanitize";
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
@@
-313,8
+313,9
@@
static test_return set_test(memcached_st *memc)
static test_return append_test(memcached_st *memc)
{
memcached_return rc;
static test_return append_test(memcached_st *memc)
{
memcached_return rc;
- char *key= "fig";
- char *value= "we";
+ const char *key= "fig";
+ const char *in_value= "we";
+ char *out_value= NULL;
size_t value_length;
uint32_t flags;
size_t value_length;
uint32_t flags;
@@
-322,7
+323,7
@@
static test_return append_test(memcached_st *memc)
assert(rc == MEMCACHED_SUCCESS);
rc= memcached_set(memc, key, strlen(key),
assert(rc == MEMCACHED_SUCCESS);
rc= memcached_set(memc, key, strlen(key),
-
value, strlen(
value),
+
in_value, strlen(in_
value),
(time_t)0, (uint32_t)0);
assert(rc == MEMCACHED_SUCCESS);
(time_t)0, (uint32_t)0);
assert(rc == MEMCACHED_SUCCESS);
@@
-336,12
+337,12
@@
static test_return append_test(memcached_st *memc)
(time_t)0, (uint32_t)0);
assert(rc == MEMCACHED_SUCCESS);
(time_t)0, (uint32_t)0);
assert(rc == MEMCACHED_SUCCESS);
- value= memcached_get(memc, key, strlen(key),
+
out_
value= memcached_get(memc, key, strlen(key),
&value_length, &flags, &rc);
&value_length, &flags, &rc);
- assert(!memcmp(value, "we the people", strlen("we the people")));
+ assert(!memcmp(
out_
value, "we the people", strlen("we the people")));
assert(strlen("we the people") == value_length);
assert(rc == MEMCACHED_SUCCESS);
assert(strlen("we the people") == value_length);
assert(rc == MEMCACHED_SUCCESS);
- free(value);
+ free(
out_
value);
return 0;
}
return 0;
}
@@
-349,7
+350,7
@@
static test_return append_test(memcached_st *memc)
static test_return append_binary_test(memcached_st *memc)
{
memcached_return rc;
static test_return append_binary_test(memcached_st *memc)
{
memcached_return rc;
- char *key= "numbers";
+ c
onst c
har *key= "numbers";
unsigned int *store_ptr;
unsigned int store_list[] = { 23, 56, 499, 98, 32847, 0 };
char *value;
unsigned int *store_ptr;
unsigned int store_list[] = { 23, 56, 499, 98, 32847, 0 };
char *value;
@@
-395,9
+396,9
@@
static test_return append_binary_test(memcached_st *memc)
static test_return cas2_test(memcached_st *memc)
{
memcached_return rc;
static test_return cas2_test(memcached_st *memc)
{
memcached_return rc;
- char *keys[]= {"fudge", "son", "food"};
+ c
onst c
har *keys[]= {"fudge", "son", "food"};
size_t key_length[]= {5, 3, 4};
size_t key_length[]= {5, 3, 4};
- char *value= "we the people";
+ c
onst c
har *value= "we the people";
size_t value_length= strlen("we the people");
unsigned int x;
memcached_result_st results_obj;
size_t value_length= strlen("we the people");
unsigned int x;
memcached_result_st results_obj;
@@
-442,7
+443,7
@@
static test_return cas_test(memcached_st *memc)
const char *key= "fun";
size_t key_length= strlen(key);
const char *value= "we the people";
const char *key= "fun";
size_t key_length= strlen(key);
const char *value= "we the people";
- c
har* keys[2] = { (char*)
key, NULL };
+ c
onst char* keys[2] = {
key, NULL };
size_t keylengths[2] = { strlen(key), 0 };
size_t value_length= strlen(value);
const char *value2= "change the value";
size_t keylengths[2] = { strlen(key), 0 };
size_t value_length= strlen(value);
const char *value2= "change the value";
@@
-499,8
+500,9
@@
static test_return cas_test(memcached_st *memc)
static test_return prepend_test(memcached_st *memc)
{
memcached_return rc;
static test_return prepend_test(memcached_st *memc)
{
memcached_return rc;
- char *key= "fig";
- char *value= "people";
+ const char *key= "fig";
+ const char *value= "people";
+ char *out_value= NULL;
size_t value_length;
uint32_t flags;
size_t value_length;
uint32_t flags;
@@
-522,12
+524,12
@@
static test_return prepend_test(memcached_st *memc)
(time_t)0, (uint32_t)0);
assert(rc == MEMCACHED_SUCCESS);
(time_t)0, (uint32_t)0);
assert(rc == MEMCACHED_SUCCESS);
- value= memcached_get(memc, key, strlen(key),
+
out_
value= memcached_get(memc, key, strlen(key),
&value_length, &flags, &rc);
&value_length, &flags, &rc);
- assert(!memcmp(value, "we the people", strlen("we the people")));
+ assert(!memcmp(
out_
value, "we the people", strlen("we the people")));
assert(strlen("we the people") == value_length);
assert(rc == MEMCACHED_SUCCESS);
assert(strlen("we the people") == value_length);
assert(rc == MEMCACHED_SUCCESS);
- free(value);
+ free(
out_
value);
return 0;
}
return 0;
}
@@
-539,8
+541,8
@@
static test_return prepend_test(memcached_st *memc)
static test_return add_test(memcached_st *memc)
{
memcached_return rc;
static test_return add_test(memcached_st *memc)
{
memcached_return rc;
- char *key= "foo";
- char *value= "when we sanitize";
+ c
onst c
har *key= "foo";
+ c
onst c
har *value= "when we sanitize";
unsigned long long setting_value;
setting_value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NO_BLOCK);
unsigned long long setting_value;
setting_value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NO_BLOCK);
@@
-587,9
+589,9
@@
static test_return add_wrapper(memcached_st *memc)
static test_return replace_test(memcached_st *memc)
{
memcached_return rc;
static test_return replace_test(memcached_st *memc)
{
memcached_return rc;
- char *key= "foo";
- char *value= "when we sanitize";
- char *original= "first we insert some data";
+ c
onst c
har *key= "foo";
+ c
onst c
har *value= "when we sanitize";
+ c
onst c
har *original= "first we insert some data";
rc= memcached_set(memc, key, strlen(key),
original, strlen(original),
rc= memcached_set(memc, key, strlen(key),
original, strlen(original),
@@
-607,8
+609,8
@@
static test_return replace_test(memcached_st *memc)
static test_return delete_test(memcached_st *memc)
{
memcached_return rc;
static test_return delete_test(memcached_st *memc)
{
memcached_return rc;
- char *key= "foo";
- char *value= "when we sanitize";
+ c
onst c
har *key= "foo";
+ c
onst c
har *value= "when we sanitize";
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
@@
-642,19
+644,19
@@
static memcached_return server_function(memcached_st *ptr __attribute__((unused
static test_return memcached_server_cursor_test(memcached_st *memc)
{
static test_return memcached_server_cursor_test(memcached_st *memc)
{
- char *context= "foo bad";
+ char context[8];
+ strcpy(context, "foo bad");
memcached_server_function callbacks[1];
callbacks[0]= server_function;
memcached_server_cursor(memc, callbacks, context, 1);
memcached_server_function callbacks[1];
callbacks[0]= server_function;
memcached_server_cursor(memc, callbacks, context, 1);
-
return 0;
}
static test_return bad_key_test(memcached_st *memc)
{
memcached_return rc;
return 0;
}
static test_return bad_key_test(memcached_st *memc)
{
memcached_return rc;
- char *key= "foo bad";
+ c
onst c
har *key= "foo bad";
char *string;
size_t string_length;
uint32_t flags;
char *string;
size_t string_length;
uint32_t flags;
@@
-687,7
+689,7
@@
static test_return bad_key_test(memcached_st *memc)
assert(!string);
/* Test multi key for bad keys */
assert(!string);
/* Test multi key for bad keys */
- char *keys[] = { "GoodKey", "Bad Key", "NotMine" };
+ c
onst c
har *keys[] = { "GoodKey", "Bad Key", "NotMine" };
size_t key_lengths[] = { 7, 7, 7 };
set= 1;
rc= memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_VERIFY_KEY, set);
size_t key_lengths[] = { 7, 7, 7 };
set= 1;
rc= memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_VERIFY_KEY, set);
@@
-756,7
+758,7
@@
static memcached_return read_through_trigger(memcached_st *memc __attribute__((
static test_return read_through(memcached_st *memc)
{
memcached_return rc;
static test_return read_through(memcached_st *memc)
{
memcached_return rc;
- char *key= "foo";
+ c
onst c
har *key= "foo";
char *string;
size_t string_length;
uint32_t flags;
char *string;
size_t string_length;
uint32_t flags;
@@
-817,7
+819,7
@@
static test_return delete_through(memcached_st *memc)
static test_return get_test(memcached_st *memc)
{
memcached_return rc;
static test_return get_test(memcached_st *memc)
{
memcached_return rc;
- char *key= "foo";
+ c
onst c
har *key= "foo";
char *string;
size_t string_length;
uint32_t flags;
char *string;
size_t string_length;
uint32_t flags;
@@
-838,8
+840,8
@@
static test_return get_test(memcached_st *memc)
static test_return get_test2(memcached_st *memc)
{
memcached_return rc;
static test_return get_test2(memcached_st *memc)
{
memcached_return rc;
- char *key= "foo";
- char *value= "when we sanitize";
+ c
onst c
har *key= "foo";
+ c
onst c
har *value= "when we sanitize";
char *string;
size_t string_length;
uint32_t flags;
char *string;
size_t string_length;
uint32_t flags;
@@
-865,8
+867,8
@@
static test_return get_test2(memcached_st *memc)
static test_return set_test2(memcached_st *memc)
{
memcached_return rc;
static test_return set_test2(memcached_st *memc)
{
memcached_return rc;
- char *key= "foo";
- char *value= "train in the brain";
+ c
onst c
har *key= "foo";
+ c
onst c
har *value= "train in the brain";
size_t value_length= strlen(value);
unsigned int x;
size_t value_length= strlen(value);
unsigned int x;
@@
-915,7
+917,7
@@
static test_return set_test3(memcached_st *memc)
static test_return get_test3(memcached_st *memc)
{
memcached_return rc;
static test_return get_test3(memcached_st *memc)
{
memcached_return rc;
- char *key= "foo";
+ c
onst c
har *key= "foo";
char *value;
size_t value_length= 8191;
char *string;
char *value;
size_t value_length= 8191;
char *string;
@@
-951,7
+953,7
@@
static test_return get_test3(memcached_st *memc)
static test_return get_test4(memcached_st *memc)
{
memcached_return rc;
static test_return get_test4(memcached_st *memc)
{
memcached_return rc;
- char *key= "foo";
+ c
onst c
har *key= "foo";
char *value;
size_t value_length= 8191;
char *string;
char *value;
size_t value_length= 8191;
char *string;
@@
-998,7
+1000,7
@@
static test_return get_test5(memcached_st *memc)
** Request the same key twice, to ensure that we hash to the same server
** (so that we have multiple response values queued up) ;-)
*/
** Request the same key twice, to ensure that we hash to the same server
** (so that we have multiple response values queued up) ;-)
*/
- char *keys[]= { "key", "key" };
+ c
onst c
har *keys[]= { "key", "key" };
size_t lengths[]= { 3, 3 };
uint32_t flags;
size_t rlen;
size_t lengths[]= { 3, 3 };
uint32_t flags;
size_t rlen;
@@
-1048,8
+1050,8
@@
static test_return increment_test(memcached_st *memc)
{
uint64_t new_number;
memcached_return rc;
{
uint64_t new_number;
memcached_return rc;
- char *key= "number";
- char *value= "0";
+ c
onst c
har *key= "number";
+ c
onst c
har *value= "0";
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
@@
-1075,7
+1077,7
@@
static test_return increment_with_initial_test(memcached_st *memc)
{
uint64_t new_number;
memcached_return rc;
{
uint64_t new_number;
memcached_return rc;
- char *key= "number";
+ c
onst c
har *key= "number";
uint64_t initial= 0;
rc= memcached_increment_with_initial(memc, key, strlen(key),
uint64_t initial= 0;
rc= memcached_increment_with_initial(memc, key, strlen(key),
@@
-1095,8
+1097,8
@@
static test_return decrement_test(memcached_st *memc)
{
uint64_t new_number;
memcached_return rc;
{
uint64_t new_number;
memcached_return rc;
- char *key= "number";
- char *value= "3";
+ c
onst c
har *key= "number";
+ c
onst c
har *value= "3";
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
@@
-1122,7
+1124,7
@@
static test_return decrement_with_initial_test(memcached_st *memc)
{
uint64_t new_number;
memcached_return rc;
{
uint64_t new_number;
memcached_return rc;
- char *key= "number";
+ c
onst c
har *key= "number";
uint64_t initial= 3;
rc= memcached_decrement_with_initial(memc, key, strlen(key),
uint64_t initial= 3;
rc= memcached_decrement_with_initial(memc, key, strlen(key),
@@
-1141,8
+1143,8
@@
static test_return decrement_with_initial_test(memcached_st *memc)
static test_return quit_test(memcached_st *memc)
{
memcached_return rc;
static test_return quit_test(memcached_st *memc)
{
memcached_return rc;
- char *key= "fudge";
- char *value= "sanford and sun";
+ c
onst c
har *key= "fudge";
+ c
onst c
har *value= "sanford and sun";
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
@@
-1161,7
+1163,7
@@
static test_return quit_test(memcached_st *memc)
static test_return mget_result_test(memcached_st *memc)
{
memcached_return rc;
static test_return mget_result_test(memcached_st *memc)
{
memcached_return rc;
- char *keys[]= {"fudge", "son", "food"};
+ c
onst c
har *keys[]= {"fudge", "son", "food"};
size_t key_length[]= {5, 3, 4};
unsigned int x;
size_t key_length[]= {5, 3, 4};
unsigned int x;
@@
-1218,7
+1220,7
@@
static test_return mget_result_test(memcached_st *memc)
static test_return mget_result_alloc_test(memcached_st *memc)
{
memcached_return rc;
static test_return mget_result_alloc_test(memcached_st *memc)
{
memcached_return rc;
- char *keys[]= {"fudge", "son", "food"};
+ c
onst c
har *keys[]= {"fudge", "son", "food"};
size_t key_length[]= {5, 3, 4};
unsigned int x;
size_t key_length[]= {5, 3, 4};
unsigned int x;
@@
-1280,7
+1282,7
@@
static memcached_return callback_counter(memcached_st *ptr __attribute__((unused
static test_return mget_result_function(memcached_st *memc)
{
memcached_return rc;
static test_return mget_result_function(memcached_st *memc)
{
memcached_return rc;
- char *keys[]= {"fudge", "son", "food"};
+ c
onst c
har *keys[]= {"fudge", "son", "food"};
size_t key_length[]= {5, 3, 4};
unsigned int x;
unsigned int counter;
size_t key_length[]= {5, 3, 4};
unsigned int x;
unsigned int counter;
@@
-1311,7
+1313,7
@@
static test_return mget_result_function(memcached_st *memc)
static test_return mget_test(memcached_st *memc)
{
memcached_return rc;
static test_return mget_test(memcached_st *memc)
{
memcached_return rc;
- char *keys[]= {"fudge", "son", "food"};
+ c
onst c
har *keys[]= {"fudge", "son", "food"};
size_t key_length[]= {5, 3, 4};
unsigned int x;
uint32_t flags;
size_t key_length[]= {5, 3, 4};
unsigned int x;
uint32_t flags;
@@
-1695,7
+1697,7
@@
static test_return user_supplied_bug3(memcached_st *memc)
key_lengths[x]= strlen(keys[x]);
}
key_lengths[x]= strlen(keys[x]);
}
- rc= memcached_mget(memc, keys, key_lengths, KEY_COUNT);
+ rc= memcached_mget(memc,
(const char **)
keys, key_lengths, KEY_COUNT);
assert(rc == MEMCACHED_SUCCESS);
/* Turn this into a help function */
assert(rc == MEMCACHED_SUCCESS);
/* Turn this into a help function */
@@
-1726,7
+1728,7
@@
static test_return user_supplied_bug3(memcached_st *memc)
static test_return user_supplied_bug4(memcached_st *memc)
{
memcached_return rc;
static test_return user_supplied_bug4(memcached_st *memc)
{
memcached_return rc;
- char *keys[]= {"fudge", "son", "food"};
+ c
onst c
har *keys[]= {"fudge", "son", "food"};
size_t key_length[]= {5, 3, 4};
unsigned int x;
uint32_t flags;
size_t key_length[]= {5, 3, 4};
unsigned int x;
uint32_t flags;
@@
-1789,7
+1791,7
@@
static test_return user_supplied_bug4(memcached_st *memc)
static test_return user_supplied_bug5(memcached_st *memc)
{
memcached_return rc;
static test_return user_supplied_bug5(memcached_st *memc)
{
memcached_return rc;
- char *keys[]= {"036790384900", "036790384902", "036790384904", "036790384906"};
+ c
onst c
har *keys[]= {"036790384900", "036790384902", "036790384904", "036790384906"};
size_t key_length[]= {strlen("036790384900"), strlen("036790384902"), strlen("036790384904"), strlen("036790384906")};
char return_key[MEMCACHED_MAX_KEY];
size_t return_key_length;
size_t key_length[]= {strlen("036790384900"), strlen("036790384902"), strlen("036790384904"), strlen("036790384906")};
char return_key[MEMCACHED_MAX_KEY];
size_t return_key_length;
@@
-1847,7
+1849,7
@@
static test_return user_supplied_bug5(memcached_st *memc)
static test_return user_supplied_bug6(memcached_st *memc)
{
memcached_return rc;
static test_return user_supplied_bug6(memcached_st *memc)
{
memcached_return rc;
- char *keys[]= {"036790384900", "036790384902", "036790384904", "036790384906"};
+ c
onst c
har *keys[]= {"036790384900", "036790384902", "036790384904", "036790384906"};
size_t key_length[]= {strlen("036790384900"), strlen("036790384902"), strlen("036790384904"), strlen("036790384906")};
char return_key[MEMCACHED_MAX_KEY];
size_t return_key_length;
size_t key_length[]= {strlen("036790384900"), strlen("036790384902"), strlen("036790384904"), strlen("036790384906")};
char return_key[MEMCACHED_MAX_KEY];
size_t return_key_length;
@@
-1916,7
+1918,7
@@
static test_return user_supplied_bug8(memcached_st *memc __attribute__((unused)
memcached_st *memc_clone;
memcached_server_st *servers;
memcached_st *memc_clone;
memcached_server_st *servers;
- char *server_list= "memcache1.memcache.bk.sapo.pt:11211, memcache1.memcache.bk.sapo.pt:11212, memcache1.memcache.bk.sapo.pt:11213, memcache1.memcache.bk.sapo.pt:11214, memcache2.memcache.bk.sapo.pt:11211, memcache2.memcache.bk.sapo.pt:11212, memcache2.memcache.bk.sapo.pt:11213, memcache2.memcache.bk.sapo.pt:11214";
+ c
onst c
har *server_list= "memcache1.memcache.bk.sapo.pt:11211, memcache1.memcache.bk.sapo.pt:11212, memcache1.memcache.bk.sapo.pt:11213, memcache1.memcache.bk.sapo.pt:11214, memcache2.memcache.bk.sapo.pt:11211, memcache2.memcache.bk.sapo.pt:11212, memcache2.memcache.bk.sapo.pt:11213, memcache2.memcache.bk.sapo.pt:11214";
servers= memcached_servers_parse(server_list);
assert(servers);
servers= memcached_servers_parse(server_list);
assert(servers);
@@
-1943,8
+1945,8
@@
static test_return user_supplied_bug8(memcached_st *memc __attribute__((unused)
static test_return user_supplied_bug7(memcached_st *memc)
{
memcached_return rc;
static test_return user_supplied_bug7(memcached_st *memc)
{
memcached_return rc;
- char *keys= "036790384900";
- size_t key_length= strlen(
"036790384900"
);
+ c
onst c
har *keys= "036790384900";
+ size_t key_length= strlen(
keys
);
char return_key[MEMCACHED_MAX_KEY];
size_t return_key_length;
char *value;
char return_key[MEMCACHED_MAX_KEY];
size_t return_key_length;
char *value;
@@
-1987,7
+1989,7
@@
static test_return user_supplied_bug7(memcached_st *memc)
static test_return user_supplied_bug9(memcached_st *memc)
{
memcached_return rc;
static test_return user_supplied_bug9(memcached_st *memc)
{
memcached_return rc;
- char *keys[]= {"UDATA:edevil@sapo.pt", "fudge&*@#", "for^#@&$not"};
+ c
onst c
har *keys[]= {"UDATA:edevil@sapo.pt", "fudge&*@#", "for^#@&$not"};
size_t key_length[3];
unsigned int x;
uint32_t flags;
size_t key_length[3];
unsigned int x;
uint32_t flags;
@@
-2031,7
+2033,7
@@
static test_return user_supplied_bug9(memcached_st *memc)
/* We are testing with aggressive timeout to get failures */
static test_return user_supplied_bug10(memcached_st *memc)
{
/* We are testing with aggressive timeout to get failures */
static test_return user_supplied_bug10(memcached_st *memc)
{
- char *key= "foo";
+ c
onst c
har *key= "foo";
char *value;
size_t value_length= 512;
unsigned int x;
char *value;
size_t value_length= 512;
unsigned int x;
@@
-2074,7
+2076,7
@@
static test_return user_supplied_bug10(memcached_st *memc)
*/
static test_return user_supplied_bug11(memcached_st *memc)
{
*/
static test_return user_supplied_bug11(memcached_st *memc)
{
- char *key= "foo";
+ c
onst c
har *key= "foo";
char *value;
size_t value_length= 512;
unsigned int x;
char *value;
size_t value_length= 512;
unsigned int x;
@@
-2199,7
+2201,7
@@
static test_return user_supplied_bug14(memcached_st *memc)
size_t setter= 1;
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, setter);
memcached_return rc;
size_t setter= 1;
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, setter);
memcached_return rc;
- char *key= "foo";
+ c
onst c
har *key= "foo";
char *value;
size_t value_length= 18000;
char *string;
char *value;
size_t value_length= 18000;
char *string;
@@
-2243,7
+2245,7
@@
static test_return user_supplied_bug15(memcached_st *memc)
{
uint32_t x;
memcached_return rc;
{
uint32_t x;
memcached_return rc;
- char *key= "mykey";
+ c
onst c
har *key= "mykey";
char *value;
size_t length;
uint32_t flags;
char *value;
size_t length;
uint32_t flags;
@@
-2280,7
+2282,7
@@
static test_return user_supplied_bug15(memcached_st *memc)
static test_return user_supplied_bug16(memcached_st *memc)
{
memcached_return rc;
static test_return user_supplied_bug16(memcached_st *memc)
{
memcached_return rc;
- char *key= "mykey";
+ c
onst c
har *key= "mykey";
char *value;
size_t length;
uint32_t flags;
char *value;
size_t length;
uint32_t flags;
@@
-2306,8
+2308,8
@@
static test_return user_supplied_bug16(memcached_st *memc)
static test_return user_supplied_bug17(memcached_st *memc)
{
memcached_return rc;
static test_return user_supplied_bug17(memcached_st *memc)
{
memcached_return rc;
- char *key= "豆瓣";
- char *value="我们在炎热抑郁的夏天无法停止豆瓣";
+ c
onst c
har *key= "豆瓣";
+ c
onst c
har *value="我们在炎热抑郁的夏天无法停止豆瓣";
char *value2;
size_t length;
uint32_t flags;
char *value2;
size_t length;
uint32_t flags;
@@
-2358,9
+2360,9
@@
static test_return user_supplied_bug20(memcached_st *memc)
{
memcached_return status;
memcached_result_st *result, result_obj;
{
memcached_return status;
memcached_result_st *result, result_obj;
- char *key = "abc";
+ c
onst c
har *key = "abc";
size_t key_len = strlen("abc");
size_t key_len = strlen("abc");
- char *value = "foobar";
+ c
onst c
har *value = "foobar";
size_t value_len = strlen(value);
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, 1);
size_t value_len = strlen(value);
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, 1);
@@
-3139,7
+3141,9
@@
static memcached_return set_prefix(memcached_st *memc)
/* Set to Zero, and then Set to something too large */
{
/* Set to Zero, and then Set to something too large */
{
- char *long_key;
+ char long_key[255];
+ memset(long_key, 0, 255);
+
rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, NULL);
assert(rc == MEMCACHED_SUCCESS);
rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, NULL);
assert(rc == MEMCACHED_SUCCESS);
@@
-3149,13
+3153,13
@@
static memcached_return set_prefix(memcached_st *memc)
/* Test a long key for failure */
/* TODO, extend test to determine based on setting, what result should be */
/* Test a long key for failure */
/* TODO, extend test to determine based on setting, what result should be */
-
long_key= "Thisismorethentheallottednumberofcharacters"
;
+
strcpy(long_key, "Thisismorethentheallottednumberofcharacters")
;
rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, long_key);
//assert(rc == MEMCACHED_BAD_KEY_PROVIDED);
assert(rc == MEMCACHED_SUCCESS);
/* Now test a key with spaces (which will fail from long key, since bad key is not set) */
rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, long_key);
//assert(rc == MEMCACHED_BAD_KEY_PROVIDED);
assert(rc == MEMCACHED_SUCCESS);
/* Now test a key with spaces (which will fail from long key, since bad key is not set) */
-
long_key= "This is more then the allotted number of characters"
;
+
strcpy(long_key, "This is more then the allotted number of characters")
;
rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, long_key);
assert(rc == MEMCACHED_BAD_KEY_PROVIDED);
rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, long_key);
assert(rc == MEMCACHED_BAD_KEY_PROVIDED);
@@
-3163,7
+3167,7
@@
static memcached_return set_prefix(memcached_st *memc)
rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_VERIFY_KEY, 1);
assert(rc == MEMCACHED_SUCCESS);
rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_VERIFY_KEY, 1);
assert(rc == MEMCACHED_SUCCESS);
-
long_key= "dog cat"
;
+
strcpy(long_key, "dog cat")
;
rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, long_key);
assert(rc == MEMCACHED_BAD_KEY_PROVIDED);
}
rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, long_key);
assert(rc == MEMCACHED_BAD_KEY_PROVIDED);
}
@@
-3429,7
+3433,7
@@
static test_return noreply_test(memcached_st *memc)
/* Try setting an illegal cas value (should not return an error to
* the caller (because we don't expect a return message from the server)
*/
/* Try setting an illegal cas value (should not return an error to
* the caller (because we don't expect a return message from the server)
*/
- char* keys[]= {"0"};
+ c
onst c
har* keys[]= {"0"};
size_t lengths[]= {1};
size_t length;
uint32_t flags;
size_t lengths[]= {1};
size_t length;
uint32_t flags;
@@
-3668,7
+3672,7
@@
static test_return replication_mget_test(memcached_st *memc)
memcached_st *memc_clone= memcached_clone(NULL, memc);
memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, 0);
memcached_st *memc_clone= memcached_clone(NULL, memc);
memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, 0);
- char *keys[]= { "bubba", "key1", "key2", "key3" };
+ c
onst c
har *keys[]= { "bubba", "key1", "key2", "key3" };
size_t len[]= { 5, 4, 4, 4 };
for (int x=0; x< 4; ++x)
size_t len[]= { 5, 4, 4, 4 };
for (int x=0; x< 4; ++x)
@@
-3705,7
+3709,7
@@
static test_return replication_mget_test(memcached_st *memc)
for (int x= 'a'; x <= 'z'; ++x)
{
for (int x= 'a'; x <= 'z'; ++x)
{
- c
har key[2]= { [0]= (
char)x };
+ c
onst char key[2]= { [0]= (const
char)x };
rc= memcached_mget_by_key(new_clone, key, 1, keys, len, 4);
assert(rc == MEMCACHED_SUCCESS);
rc= memcached_mget_by_key(new_clone, key, 1, keys, len, 4);
assert(rc == MEMCACHED_SUCCESS);
@@
-3737,7
+3741,7
@@
static test_return replication_delete_test(memcached_st *memc)
MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS);
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, --repl);
MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS);
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, --repl);
- char *keys[]= { "bubba", "key1", "key2", "key3" };
+ c
onst c
har *keys[]= { "bubba", "key1", "key2", "key3" };
size_t len[]= { 5, 4, 4, 4 };
for (int x=0; x< 4; ++x)
size_t len[]= { 5, 4, 4, 4 };
for (int x=0; x< 4; ++x)
@@
-3764,7
+3768,7
@@
static test_return replication_delete_test(memcached_st *memc)
{
for (int x= 'a'; x <= 'z'; ++x)
{
{
for (int x= 'a'; x <= 'z'; ++x)
{
- c
har key[2]= { [0]= (
char)x };
+ c
onst char key[2]= { [0]= (const
char)x };
rc= memcached_mget_by_key(memc_clone, key, 1, keys, len, 4);
assert(rc == MEMCACHED_SUCCESS);
rc= memcached_mget_by_key(memc_clone, key, 1, keys, len, 4);
assert(rc == MEMCACHED_SUCCESS);
@@
-3907,8
+3911,8
@@
static test_return udp_set_test(memcached_st *memc)
for (x= 0; x < num_iters;x++)
{
memcached_return rc;
for (x= 0; x < num_iters;x++)
{
memcached_return rc;
- char *key= "foo";
- char *value= "when we sanitize";
+ c
onst c
har *key= "foo";
+ c
onst c
har *value= "when we sanitize";
uint16_t *expected_ids= get_udp_request_ids(memc);
unsigned int server_key= memcached_generate_hash(memc,key,strlen(key));
size_t init_offset= memc->hosts[server_key].write_buffer_offset;
uint16_t *expected_ids= get_udp_request_ids(memc);
unsigned int server_key= memcached_generate_hash(memc,key,strlen(key));
size_t init_offset= memc->hosts[server_key].write_buffer_offset;
@@
-3947,7
+3951,7
@@
static test_return udp_buffered_set_test(memcached_st *memc)
static test_return udp_set_too_big_test(memcached_st *memc)
{
memcached_return rc;
static test_return udp_set_too_big_test(memcached_st *memc)
{
memcached_return rc;
- char *key= "bar";
+ c
onst c
har *key= "bar";
char value[MAX_UDP_DATAGRAM_LENGTH];
uint16_t *expected_ids= get_udp_request_ids(memc);
rc= memcached_set(memc, key, strlen(key),
char value[MAX_UDP_DATAGRAM_LENGTH];
uint16_t *expected_ids= get_udp_request_ids(memc);
rc= memcached_set(memc, key, strlen(key),
@@
-3964,7
+3968,7
@@
static test_return udp_delete_test(memcached_st *memc)
for (x= 0; x < num_iters;x++)
{
memcached_return rc;
for (x= 0; x < num_iters;x++)
{
memcached_return rc;
- char *key= "foo";
+ c
onst c
har *key= "foo";
uint16_t *expected_ids=get_udp_request_ids(memc);
unsigned int server_key= memcached_generate_hash(memc, key, strlen(key));
size_t init_offset= memc->hosts[server_key].write_buffer_offset;
uint16_t *expected_ids=get_udp_request_ids(memc);
unsigned int server_key= memcached_generate_hash(memc, key, strlen(key));
size_t init_offset= memc->hosts[server_key].write_buffer_offset;
@@
-4026,8
+4030,8
@@
static test_return udp_flush_test(memcached_st *memc)
static test_return udp_incr_test(memcached_st *memc)
{
memcached_return rc;
static test_return udp_incr_test(memcached_st *memc)
{
memcached_return rc;
- char *key= "incr";
- char *value= "1";
+ c
onst c
har *key= "incr";
+ c
onst c
har *value= "1";
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
(time_t)0, (uint32_t)0);
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
(time_t)0, (uint32_t)0);
@@
-4045,8
+4049,8
@@
static test_return udp_incr_test(memcached_st *memc)
static test_return udp_decr_test(memcached_st *memc)
{
memcached_return rc;
static test_return udp_decr_test(memcached_st *memc)
{
memcached_return rc;
- char *key= "decr";
- char *value= "1";
+ c
onst c
har *key= "decr";
+ c
onst c
har *value= "1";
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
(time_t)0, (uint32_t)0);
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
(time_t)0, (uint32_t)0);
@@
-4086,7
+4090,7
@@
static test_return udp_version_test(memcached_st *memc)
static test_return udp_get_test(memcached_st *memc)
{
memcached_return rc;
static test_return udp_get_test(memcached_st *memc)
{
memcached_return rc;
- char *key= "foo";
+ c
onst c
har *key= "foo";
size_t vlen;
uint16_t *expected_ids = get_udp_request_ids(memc);
char *val= memcached_get(memc, key, strlen(key), &vlen, (uint32_t)0, &rc);
size_t vlen;
uint16_t *expected_ids = get_udp_request_ids(memc);
char *val= memcached_get(memc, key, strlen(key), &vlen, (uint32_t)0, &rc);
@@
-4130,7
+4134,7
@@
static test_return hsieh_avaibility_test (memcached_st *memc)
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
-static char *list[]=
+static c
onst c
har *list[]=
{
"apple",
"beat",
{
"apple",
"beat",
@@
-4163,7
+4167,7
@@
static char *list[]=
static test_return md5_run (memcached_st *memc __attribute__((unused)))
{
uint32_t x;
static test_return md5_run (memcached_st *memc __attribute__((unused)))
{
uint32_t x;
- char **ptr;
+ c
onst c
har **ptr;
uint32_t values[]= { 3195025439U, 2556848621U, 3724893440U, 3332385401U,
245758794U, 2550894432U, 121710495U, 3053817768U,
1250994555U, 1862072655U, 2631955953U, 2951528551U,
uint32_t values[]= { 3195025439U, 2556848621U, 3724893440U, 3332385401U,
245758794U, 2550894432U, 121710495U, 3053817768U,
1250994555U, 1862072655U, 2631955953U, 2951528551U,
@@
-4187,7
+4191,7
@@
static test_return md5_run (memcached_st *memc __attribute__((unused)))
static test_return crc_run (memcached_st *memc __attribute__((unused)))
{
uint32_t x;
static test_return crc_run (memcached_st *memc __attribute__((unused)))
{
uint32_t x;
- char **ptr;
+ c
onst c
har **ptr;
uint32_t values[]= { 10542U, 22009U, 14526U, 19510U, 19432U, 10199U, 20634U,
9369U, 11511U, 10362U, 7893U, 31289U, 11313U, 9354U,
7621U, 30628U, 15218U, 25967U, 2695U, 9380U,
uint32_t values[]= { 10542U, 22009U, 14526U, 19510U, 19432U, 10199U, 20634U,
9369U, 11511U, 10362U, 7893U, 31289U, 11313U, 9354U,
7621U, 30628U, 15218U, 25967U, 2695U, 9380U,
@@
-4207,7
+4211,7
@@
static test_return crc_run (memcached_st *memc __attribute__((unused)))
static test_return fnv1_64_run (memcached_st *memc __attribute__((unused)))
{
uint32_t x;
static test_return fnv1_64_run (memcached_st *memc __attribute__((unused)))
{
uint32_t x;
- char **ptr;
+ c
onst c
har **ptr;
uint32_t values[]= { 473199127U, 4148981457U, 3971873300U, 3257986707U,
1722477987U, 2991193800U, 4147007314U, 3633179701U,
1805162104U, 3503289120U, 3395702895U, 3325073042U,
uint32_t values[]= { 473199127U, 4148981457U, 3971873300U, 3257986707U,
1722477987U, 2991193800U, 4147007314U, 3633179701U,
1805162104U, 3503289120U, 3395702895U, 3325073042U,
@@
-4230,7
+4234,7
@@
static test_return fnv1_64_run (memcached_st *memc __attribute__((unused)))
static test_return fnv1a_64_run (memcached_st *memc __attribute__((unused)))
{
uint32_t x;
static test_return fnv1a_64_run (memcached_st *memc __attribute__((unused)))
{
uint32_t x;
- char **ptr;
+ c
onst c
har **ptr;
uint32_t values[]= { 1488911807U, 2500855813U, 1510099634U, 1390325195U,
3647689787U, 3241528582U, 1669328060U, 2604311949U,
734810122U, 1516407546U, 560948863U, 1767346780U,
uint32_t values[]= { 1488911807U, 2500855813U, 1510099634U, 1390325195U,
3647689787U, 3241528582U, 1669328060U, 2604311949U,
734810122U, 1516407546U, 560948863U, 1767346780U,
@@
-4253,7
+4257,7
@@
static test_return fnv1a_64_run (memcached_st *memc __attribute__((unused)))
static test_return fnv1_32_run (memcached_st *memc __attribute__((unused)))
{
uint32_t x;
static test_return fnv1_32_run (memcached_st *memc __attribute__((unused)))
{
uint32_t x;
- char **ptr;
+ c
onst c
har **ptr;
uint32_t values[]= { 67176023U, 1190179409U, 2043204404U, 3221866419U,
2567703427U, 3787535528U, 4147287986U, 3500475733U,
344481048U, 3865235296U, 2181839183U, 119581266U,
uint32_t values[]= { 67176023U, 1190179409U, 2043204404U, 3221866419U,
2567703427U, 3787535528U, 4147287986U, 3500475733U,
344481048U, 3865235296U, 2181839183U, 119581266U,
@@
-4277,7
+4281,7
@@
static test_return fnv1_32_run (memcached_st *memc __attribute__((unused)))
static test_return fnv1a_32_run (memcached_st *memc __attribute__((unused)))
{
uint32_t x;
static test_return fnv1a_32_run (memcached_st *memc __attribute__((unused)))
{
uint32_t x;
- char **ptr;
+ c
onst c
har **ptr;
uint32_t values[]= { 280767167U, 2421315013U, 3072375666U, 855001899U,
459261019U, 3521085446U, 18738364U, 1625305005U,
2162232970U, 777243802U, 3323728671U, 132336572U,
uint32_t values[]= { 280767167U, 2421315013U, 3072375666U, 855001899U,
459261019U, 3521085446U, 18738364U, 1625305005U,
2162232970U, 777243802U, 3323728671U, 132336572U,
@@
-4300,7
+4304,7
@@
static test_return fnv1a_32_run (memcached_st *memc __attribute__((unused)))
static test_return hsieh_run (memcached_st *memc __attribute__((unused)))
{
uint32_t x;
static test_return hsieh_run (memcached_st *memc __attribute__((unused)))
{
uint32_t x;
- char **ptr;
+ c
onst c
har **ptr;
#ifdef HAVE_HSIEH_HASH
uint32_t values[]= { 3738850110, 3636226060, 3821074029, 3489929160, 3485772682, 80540287,
1805464076, 1895033657, 409795758, 979934958, 3634096985, 1284445480,
#ifdef HAVE_HSIEH_HASH
uint32_t values[]= { 3738850110, 3636226060, 3821074029, 3489929160, 3485772682, 80540287,
1805464076, 1895033657, 409795758, 979934958, 3634096985, 1284445480,
@@
-4325,7
+4329,7
@@
static test_return hsieh_run (memcached_st *memc __attribute__((unused)))
static test_return murmur_run (memcached_st *memc __attribute__((unused)))
{
uint32_t x;
static test_return murmur_run (memcached_st *memc __attribute__((unused)))
{
uint32_t x;
- char **ptr;
+ c
onst c
har **ptr;
uint32_t values[]= { 473199127U, 4148981457U, 3971873300U, 3257986707U,
1722477987U, 2991193800U, 4147007314U, 3633179701U,
1805162104U, 3503289120U, 3395702895U, 3325073042U,
uint32_t values[]= { 473199127U, 4148981457U, 3971873300U, 3257986707U,
1722477987U, 2991193800U, 4147007314U, 3633179701U,
1805162104U, 3503289120U, 3395702895U, 3325073042U,
@@
-4348,7
+4352,7
@@
static test_return murmur_run (memcached_st *memc __attribute__((unused)))
static test_return jenkins_run (memcached_st *memc __attribute__((unused)))
{
uint32_t x;
static test_return jenkins_run (memcached_st *memc __attribute__((unused)))
{
uint32_t x;
- char **ptr;
+ c
onst c
har **ptr;
uint32_t values[]= { 1442444624U, 4253821186U, 1885058256U, 2120131735U,
3261968576U, 3515188778U, 4232909173U, 4288625128U,
1812047395U, 3689182164U, 2502979932U, 1214050606U,
uint32_t values[]= { 1442444624U, 4253821186U, 1885058256U, 2120131735U,
3261968576U, 3515188778U, 4232909173U, 4288625128U,
1812047395U, 3689182164U, 2502979932U, 1214050606U,
diff --git
a/tests/ketama_test_cases.h
b/tests/ketama_test_cases.h
index 2c13b6718f07d26dd7fcdf666a7048383b1b9a1a..a0d72b083b3ff3b1099fc801077a29d364ed7d3b 100644
(file)
--- a/
tests/ketama_test_cases.h
+++ b/
tests/ketama_test_cases.h
@@
-1,8
+1,8
@@
typedef struct {
typedef struct {
- char *key;
+ c
onst c
har *key;
unsigned long hash1;
unsigned long hash2;
unsigned long hash1;
unsigned long hash2;
- char *server;
+ c
onst c
har *server;
} TestCase;
static TestCase test_cases[99] = {
} TestCase;
static TestCase test_cases[99] = {
diff --git
a/tests/udp.c
b/tests/udp.c
index 4c7050e213846b6bd5eac0a465ea7902a998117f..2fc178f07f15bfe9833c7967994467957b92b910 100644
(file)
--- a/
tests/udp.c
+++ b/
tests/udp.c
@@
-22,8
+22,8
@@
void world_destroy(void *p);
test_return set_test(memcached_st *memc)
{
memcached_return rc;
test_return set_test(memcached_st *memc)
{
memcached_return rc;
- char *key= "foo";
- char *value= "when we sanitize";
+ c
onst c
har *key= "foo";
+ c
onst c
har *value= "when we sanitize";
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),
rc= memcached_set(memc, key, strlen(key),
value, strlen(value),