Fixed all warnings in code.

[awesomized/libmemcached] / src / memcat.c

diff --git a/src/memcat.c b/src/memcat.c
index ed540abb0c54b7eadcd0eabb2e869e4fdb4af39f..1e7f5bf7821131aa1c63c371dc46c6caa53d7332 100644 (file)
--- a/src/memcat.c
+++ b/src/memcat.c
@@ -10,8 +10,8 @@
 /* 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
@@ -26,7 +26,8 @@ int main(int argc, char *argv[])
 \r
   options_parse(argc, argv);\r
 \r
-  parse_opt_servers(memc, opt_servers);\r
+  if (opt_servers)\r
+    parse_opt_servers(memc, opt_servers);\r
 \r
   while (optind <= argc) \r
   {\r
@@ -36,29 +37,31 @@ int main(int argc, char *argv[])
     {\r
       if (opt_displayflag)\r
       {\r
-       if (opt_verbose)\r
-         printf("key: %s\nflags: ", argv[optind]);\r
-       printf("%x\n", flags);\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", string_length, string);\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
+              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
@@ -72,8 +75,8 @@ void options_parse(int argc, char *argv[])
     {\r
       {"version", no_argument, NULL, OPT_VERSION},\r
       {"help", no_argument, NULL, OPT_HELP},\r
-      {"verbose", no_argument, &opt_verbose, 1},\r
-      {"debug", no_argument, &opt_verbose, 2},\r
+      {"verbose", no_argument, &opt_verbose, OPT_VERBOSE},\r
+      {"debug", no_argument, &opt_verbose, OPT_DEBUG},\r
       {"servers", required_argument, NULL, OPT_SERVERS},\r
       {"flag", no_argument, &opt_displayflag, OPT_FLAG},\r
       {0, 0, 0, 0},\r
@@ -96,7 +99,7 @@ void options_parse(int argc, char *argv[])
       exit(0);\r
       break;\r
     case OPT_SERVERS: /* --servers or -s */\r
-      opt_servers= optarg;\r
+      opt_servers= strdup(optarg);\r
       break;\r
     case '?':\r
       /* getopt_long already printed an error message. */\r