projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix for gcc 4.4 error.
[m6w6/libmemcached]
/
clients
/
memslap.c
diff --git
a/clients/memslap.c
b/clients/memslap.c
index 5e747b23fc58ee9789beda3e590b3634841e1b05..279be30b67d4e9aa9df96fda4607280574320a92 100644
(file)
--- a/
clients/memslap.c
+++ b/
clients/memslap.c
@@
-89,7
+89,7
@@
int main(int argc, char *argv[])
memset(&conclusion, 0, sizeof(conclusions_st));
memset(&conclusion, 0, sizeof(conclusions_st));
- srandom(time(NULL));
+ srandom(
(unsigned int)
time(NULL));
options_parse(argc, argv);
if (!opt_servers)
options_parse(argc, argv);
if (!opt_servers)
@@
-146,13
+146,15
@@
void scheduler(memcached_server_st *servers, conclusions_st *conclusion)
/* We need to set udp behavior before adding servers to the client */
if (opt_udp_io)
{
/* We need to set udp behavior before adding servers to the client */
if (opt_udp_io)
{
- memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP, opt_udp_io);
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP,
+ (uint64_t)opt_udp_io);
for(x= 0; x < servers[0].count; x++ )
servers[x].type= MEMCACHED_CONNECTION_UDP;
}
memcached_server_push(memc, servers);
for(x= 0; x < servers[0].count; x++ )
servers[x].type= MEMCACHED_CONNECTION_UDP;
}
memcached_server_push(memc, servers);
- memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, opt_binary);
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL,
+ (uint64_t)opt_binary);
if (opt_flush)
flush_all(memc);
if (opt_flush)
flush_all(memc);
@@
-312,13
+314,13
@@
void options_parse(int argc, char *argv[])
}
break;
case OPT_SLAP_CONCURRENCY:
}
break;
case OPT_SLAP_CONCURRENCY:
- opt_concurrency=
strto
l(optarg, (char **)NULL, 10);
+ opt_concurrency=
(unsigned int)strtou
l(optarg, (char **)NULL, 10);
break;
case OPT_SLAP_EXECUTE_NUMBER:
break;
case OPT_SLAP_EXECUTE_NUMBER:
- opt_execute_number=
strto
l(optarg, (char **)NULL, 10);
+ opt_execute_number=
(unsigned int)strtou
l(optarg, (char **)NULL, 10);
break;
case OPT_SLAP_INITIAL_LOAD:
break;
case OPT_SLAP_INITIAL_LOAD:
- opt_createial_load=
strto
l(optarg, (char **)NULL, 10);
+ opt_createial_load=
(unsigned int)strtou
l(optarg, (char **)NULL, 10);
break;
case '?':
/* getopt_long already printed an error message. */
break;
case '?':
/* getopt_long already printed an error message. */