projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merged trunk.
[awesomized/libmemcached]
/
clients
/
utilities.c
diff --git
a/clients/utilities.c
b/clients/utilities.c
index 1e8e89d70a0a50671fdd87dfa16ab96e2328516a..9ad6edcf90789310dea7d3c4da3abcc8dbb45ac1 100644
(file)
--- a/
clients/utilities.c
+++ b/
clients/utilities.c
@@
-1,3
+1,4
@@
+#include "libmemcached/common.h"
#include <stdio.h>
#include <ctype.h>
#include <string.h>
#include <stdio.h>
#include <ctype.h>
#include <string.h>
@@
-8,20
+9,20
@@
long int timedif(struct timeval a, struct timeval b)
{
register int us, s;
{
register int us, s;
- us =
a.tv_usec - b.tv_usec
;
+ us =
(int)(a.tv_usec - b.tv_usec)
;
us /= 1000;
us /= 1000;
- s =
a.tv_sec - b.tv_sec
;
+ s =
(int)(a.tv_sec - b.tv_sec)
;
s *= 1000;
return s + us;
}
s *= 1000;
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)
{
@@
-44,13
+45,16
@@
static char *lookup_help(memcached_options option)
case OPT_FLUSH: return("Flush servers before running tests.");
case OPT_HASH: return("Select hash type.");
case OPT_BINARY: return("Switch to binary protocol.");
case OPT_FLUSH: return("Flush servers before running tests.");
case OPT_HASH: return("Select hash type.");
case OPT_BINARY: return("Switch to binary protocol.");
+ case OPT_ANALYZE: return("Analyze the provided servers.");
+ case OPT_UDP: return("Use UDP protocol when communicating with server.");
+ default: WATCHPOINT_ASSERT(0);
};
WATCHPOINT_ASSERT(0);
return "forgot to document this function :)";
}
};
WATCHPOINT_ASSERT(0);
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)))
{
@@
-62,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 ? '=' : ' ');