Fixed all warnings in code.

[m6w6/libmemcached] / src / memcat.c

diff --git a/src/memcat.c b/src/memcat.c
index 77c0f8586829348619b1c4081391254665ab3d32..1e7f5bf7821131aa1c63c371dc46c6caa53d7332 100644 (file)
--- a/src/memcat.c
+++ b/src/memcat.c
@@ -2,10 +2,16 @@
 #include <unistd.h>\r
 #include <getopt.h>\r
 #include <memcached.h>\r
+\r
 #include "client_options.h"\r
+#include "utilities.h"\r
+\r
+\r
+/* Prototypes */\r
+void options_parse(int argc, char *argv[]);\r
 \r
-static int opt_verbose;\r
-static int opt_displayflag;\r
+static int opt_verbose= 0;\r
+static int opt_displayflag= 0;\r
 static char *opt_servers;\r
 \r
 int main(int argc, char *argv[])\r
@@ -13,11 +19,59 @@ int main(int argc, char *argv[])
   memcached_st *memc;\r
   char *string;\r
   size_t string_length;\r
-  uint16_t  flags;\r
+  uint16_t flags;\r
   memcached_return rc;\r
-  unsigned int x;\r
 \r
-  static struct option long_options[] =\r
+  memc= memcached_init(NULL);\r
+\r
+  options_parse(argc, argv);\r
+\r
+  if (opt_servers)\r
+    parse_opt_servers(memc, opt_servers);\r
+\r
+  while (optind <= argc) \r
+  {\r
+    string= memcached_get(memc, argv[optind], strlen(argv[optind]),\r
+                          &string_length, &flags, &rc);\r
+    if (rc == MEMCACHED_SUCCESS) \r
+    {\r
+      if (opt_displayflag)\r
+      {\r
+        if (opt_verbose)\r
+          printf("key: %s\nflags: ", argv[optind]);\r
+        printf("%x\n", flags);\r
+      }\r
+      else \r
+      {\r
+        if (opt_verbose)\r
+          printf("key: %s\nflags: %x\nlength: %zu\nvalue: ",\r
+                 argv[optind], flags, string_length);\r
+        printf("%.*s\n", (int)string_length, string);\r
+        free(string);\r
+      }\r
+    }\r
+    else\r
+    {\r
+      fprintf(stderr, "memcat: %s: memcache error %s\n", \r
+              argv[optind], memcached_strerror(memc, rc));\r
+    }\r
+    optind++;\r
+  }\r
+\r
+  memcached_deinit(memc);\r
+\r
+  free(opt_servers);\r
+\r
+  return 0;\r
+};\r
+\r
+\r
+void options_parse(int argc, char *argv[])\r
+{\r
+  int option_index= 0;\r
+  int option_rv;\r
+\r
+  static struct option long_options[]=\r
     {\r
       {"version", no_argument, NULL, OPT_VERSION},\r
       {"help", no_argument, NULL, OPT_HELP},\r
@@ -27,26 +81,25 @@ int main(int argc, char *argv[])
       {"flag", no_argument, &opt_displayflag, OPT_FLAG},\r
       {0, 0, 0, 0},\r
     };\r
-  int option_index = 0;\r
-  int option_rv;\r
 \r
   while (1) \r
   {\r
-    option_rv = getopt_long(argc, argv, "", long_options, &option_index);\r
+    option_rv= getopt_long(argc, argv, "Vhvds:", long_options, &option_index);\r
     if (option_rv == -1) break;\r
-    switch (option_rv) {\r
+    switch (option_rv)\r
+    {\r
     case 0:\r
       break;\r
-    case OPT_VERSION: /* --version */\r
+    case OPT_VERSION: /* --version or -V */\r
       printf("memcache tools, memcat, v1.0\n");\r
       exit(0);\r
       break;\r
-    case OPT_HELP: /* --help */\r
+    case OPT_HELP: /* --help or -h */\r
       printf("useful help messages go here\n");\r
       exit(0);\r
       break;\r
-    case OPT_SERVERS: /* --servers */\r
-      opt_servers = strdup(optarg);\r
+    case OPT_SERVERS: /* --servers or -s */\r
+      opt_servers= strdup(optarg);\r
       break;\r
     case '?':\r
       /* getopt_long already printed an error message. */\r
@@ -55,22 +108,4 @@ int main(int argc, char *argv[])
       abort();\r
     }\r
   }\r
-\r
-  /* todo, turn opt_servers into something to pass to memcached_init */\r
-  memc= memcached_init(NULL);\r
-\r
-  for (x= 1; x < argc; x++)\r
-  {\r
-    string= memcached_get(memc, argv[x], strlen(argv[x]),\r
-                          &string_length, &flags, &rc);\r
-    if (string) \r
-    {\r
-      printf("%.*s\n", string_length, string);\r
-      free(string);\r
-    }\r
-  }\r
-\r
-  memcached_deinit(memc);\r
-\r
-  return 0;\r
-};\r
+}\r