X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Futilities.c;h=e7d8df94b067302c8ca2095501d2f5fa03c6e1ab;hb=771170f522f2186b7fb0cde6052dbe37c1a9f1b7;hp=466c048543d100207ba08e2f0b569612ec6e4583;hpb=73ab14c882ca0f2b7112ab4cd9dfb16d5f41916e;p=m6w6%2Flibmemcached diff --git a/clients/utilities.c b/clients/utilities.c index 466c0485..e7d8df94 100644 --- a/clients/utilities.c +++ b/clients/utilities.c @@ -9,26 +9,26 @@ long int timedif(struct timeval a, struct timeval b) { register int us, s; - us = a.tv_usec - b.tv_usec; + us = (int)(a.tv_usec - b.tv_usec); us /= 1000; - s = a.tv_sec - b.tv_sec; + s = (int)(a.tv_sec - b.tv_sec); s *= 1000; return s + us; } -void version_command(char *command_name) +void version_command(const char *command_name) { printf("%s v%u.%u\n", command_name, 1, 0); exit(0); } -static 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."); - case OPT_HELP: return("Diplay this message and then exit."); + case OPT_HELP: return("Display 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."); @@ -54,7 +54,7 @@ static char *lookup_help(memcached_options option) return "forgot to document this function :)"; } -void help_command(char *command_name, char *description, +void help_command(const char *command_name, const char *description, 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++) { - char *help_message; + const char *help_message; printf("\t --%s%c\n", long_options[x].name, long_options[x].has_arg ? '=' : ' ');