X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Fmemdump.c;h=4329c1bdd099db1b7a53ccba9653d10dd633142f;hb=ebe4a05e9b023d7ef5b26ee98318a11582264efd;hp=3dc687d8e8d3a27f23954836b26f3bd4944b5c40;hpb=35ea8bcfbe3002ad02773a2398b3683a63654d17;p=awesomized%2Flibmemcached

diff --git a/clients/memdump.c b/clients/memdump.c
index 3dc687d8..4329c1bd 100644
--- a/clients/memdump.c
+++ b/clients/memdump.c
@@ -1,3 +1,14 @@
+/* LibMemcached
+ * Copyright (C) 2006-2009 Brian Aker
+ * All rights reserved.
+ *
+ * Use and distribution licensed under the BSD license.  See
+ * the COPYING file in the parent directory for full text.
+ *
+ * Summary:
+ *
+ */
+
 #include "libmemcached/common.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -21,7 +32,7 @@
 #define PROGRAM_DESCRIPTION "Dump all values from one or many servers."
 
 /* Prototypes */
-void options_parse(int argc, char *argv[]);
+static void options_parse(int argc, char *argv[]);
 
 static int opt_binary=0;
 static int opt_verbose= 0;
@@ -29,9 +40,9 @@ static char *opt_servers= NULL;
 static char *opt_hash= NULL;
 
 /* Print the keys and counter how many were found */
-static memcached_return key_printer(memcached_st *ptr __attribute__((unused)),  
-                                              const char *key, size_t key_length, 
-                                              void *context __attribute__((unused)))
+static memcached_return_t key_printer(memcached_st *ptr __attribute__((unused)),
+                                      const char *key, size_t key_length,
+                                      void *context __attribute__((unused)))
 {
   printf("%.*s\n", (uint32_t)key_length, key);
 
@@ -41,9 +52,9 @@ static memcached_return key_printer(memcached_st *ptr __attribute__((unused)),
 int main(int argc, char *argv[])
 {
   memcached_st *memc;
-  memcached_return rc;
+  memcached_return_t rc;
   memcached_server_st *servers;
-  memcached_dump_func callbacks[1];
+  memcached_dump_fn callbacks[1];
 
   callbacks[0]= &key_printer;
 
@@ -95,24 +106,24 @@ int main(int argc, char *argv[])
   return 0;
 }
 
-void options_parse(int argc, char *argv[])
+static void options_parse(int argc, char *argv[])
 {
   int option_index= 0;
   int option_rv;
 
   static struct option long_options[]=
     {
-      {"version", no_argument, NULL, OPT_VERSION},
-      {"help", no_argument, NULL, OPT_HELP},
-      {"verbose", no_argument, &opt_verbose, OPT_VERBOSE},
-      {"debug", no_argument, &opt_verbose, OPT_DEBUG},
-      {"servers", required_argument, NULL, OPT_SERVERS},
-      {"hash", required_argument, NULL, OPT_HASH},
-      {"binary", no_argument, NULL, OPT_BINARY},
+      {(OPTIONSTRING)"version", no_argument, NULL, OPT_VERSION},
+      {(OPTIONSTRING)"help", no_argument, NULL, OPT_HELP},
+      {(OPTIONSTRING)"verbose", no_argument, &opt_verbose, OPT_VERBOSE},
+      {(OPTIONSTRING)"debug", no_argument, &opt_verbose, OPT_DEBUG},
+      {(OPTIONSTRING)"servers", required_argument, NULL, OPT_SERVERS},
+      {(OPTIONSTRING)"hash", required_argument, NULL, OPT_HASH},
+      {(OPTIONSTRING)"binary", no_argument, NULL, OPT_BINARY},
       {0, 0, 0, 0}
     };
 
-  while (1) 
+  while (1)
   {
     option_rv= getopt_long(argc, argv, "Vhvds:", long_options, &option_index);