projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updating Patrick's C++ exceptions to build without warnings on solaris.
[m6w6/libmemcached]
/
clients
/
utilities.c
diff --git
a/clients/utilities.c
b/clients/utilities.c
index b5755ee12139dab629e23a342ef786b8b94049f0..e7d8df94b067302c8ca2095501d2f5fa03c6e1ab 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,26
+9,26
@@
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);
}
-char *lookup_help(memcached_options option)
+
static const
char *lookup_help(memcached_options option)
{
switch (option)
{
case OPT_SERVERS: return("List which servers you wish to connect to.");
case OPT_VERSION: return("Display the version of the application and then exit.");
{
switch (option)
{
case OPT_SERVERS: return("List which servers you wish to connect to.");
case OPT_VERSION: return("Display the version of the application and then exit.");
- case OPT_HELP: return("Diplay this message and then exit.");
+ case OPT_HELP: return("Di
s
play this message and then exit.");
case OPT_VERBOSE: return("Give more details on the progression of the application.");
case OPT_DEBUG: return("Provide output only useful for debugging.");
case OPT_FLAG: return("Provide flag information for storage operation.");
case OPT_VERBOSE: return("Give more details on the progression of the application.");
case OPT_DEBUG: return("Provide output only useful for debugging.");
case OPT_FLAG: return("Provide flag information for storage operation.");
@@
-43,15
+44,19
@@
char *lookup_help(memcached_options option)
case OPT_SLAP_TCP_NODELAY: return("Set TCP socket up to use nodelay.");
case OPT_FLUSH: return("Flush servers before running tests.");
case OPT_HASH: return("Select hash type.");
case OPT_SLAP_TCP_NODELAY: return("Set TCP socket up to use nodelay.");
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,
const struct option *long_options,
- memcached_programs_help_st *options)
+ memcached_programs_help_st *options
__attribute__((unused))
)
{
unsigned int x;
{
unsigned int x;
@@
-61,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 ? '=' : ' ');