Fixed all warnings in code.

[awesomized/libmemcached] / src / memcp.c

diff --git a/src/memcp.c b/src/memcp.c
index bba346b973f047856fb1eff95df45e0f8ff177c9..ec9a2fafb12a2b1bf88389cb4c6d6585c7ef5b32 100644 (file)
--- a/src/memcp.c
+++ b/src/memcp.c
@@ -9,25 +9,26 @@
 \r
 #include <memcached.h>\r
 #include "client_options.h"\r
+#include "utilities.h"\r
 \r
 /* Prototypes */\r
 void options_parse(int argc, char *argv[]);\r
 \r
 static int opt_verbose= 0;\r
 static char *opt_servers= NULL;\r
-static int opt_method= 0;\r
-uint16_t opt_flags= 0;\r
-time_t opt_expires= 0;\r
+static int opt_method= OPT_SET;\r
+static uint16_t opt_flags= 0;\r
+static time_t opt_expires= 0;\r
 \r
 int main(int argc, char *argv[])\r
 {\r
   memcached_st *memc;\r
-  char *string;\r
-  size_t string_length;\r
   memcached_return rc;\r
+\r
   options_parse(argc, argv);\r
 \r
   memc= memcached_init(NULL);\r
+\r
   if (opt_servers)\r
     parse_opt_servers(memc, opt_servers);\r
   else\r
@@ -42,7 +43,7 @@ int main(int argc, char *argv[])
     char *file_buffer_ptr;\r
 \r
     fd= open(argv[optind], O_RDONLY);\r
-    if (fd < 0) \r
+    if (fd < 0)\r
     {\r
       fprintf(stderr, "memcp: %s: %s\n", argv[optind], strerror(errno));\r
       optind++;\r
@@ -61,9 +62,9 @@ int main(int argc, char *argv[])
     {\r
       static char *opstr[] = { "set", "add", "replace" };\r
       printf("op: %s\nsource file: %s\nlength: %zu\n"\r
-            "key: %s\nflags: %u\n expires: %llu\n",\r
-            opstr[opt_method], argv[optind], sbuf.st_size,\r
-            ptr, opt_flags, opt_expires);\r
+            "key: %s\nflags: %x\n expires: %llu\n",\r
+            opstr[opt_method], argv[optind], (size_t)sbuf.st_size,\r
+            ptr, opt_flags, (unsigned long long)opt_expires);\r
     }\r
 \r
     if ((file_buffer_ptr= (char *)malloc(sizeof(char) * sbuf.st_size)) == NULL)\r
@@ -104,17 +105,17 @@ int main(int argc, char *argv[])
 \r
   memcached_deinit(memc);\r
 \r
-  cleanup();\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
+  static struct option long_options[]=\r
     {\r
       {"version", no_argument, NULL, OPT_VERSION},\r
       {"help", no_argument, NULL, OPT_HELP},\r
@@ -135,7 +136,8 @@ void options_parse(int argc, char *argv[])
 \r
     if (option_rv == -1) break;\r
 \r
-    switch (option_rv) {\r
+    switch (option_rv)\r
+    {\r
     case 0:\r
       break;\r
     case OPT_VERSION: /* --version or -V */\r
@@ -145,13 +147,13 @@ void options_parse(int argc, char *argv[])
       printf("useful help messages go here\n");\r
       exit(0);\r
     case OPT_SERVERS: /* --servers or -s */\r
-      opt_servers= strdup_cleanup(optarg);\r
+      opt_servers= strdup(optarg);\r
       break;\r
     case OPT_FLAG: /* --flag */\r
-      opt_flags= (uint16_t)strtol(optarg, (char **)NULL, 10);\r
+      opt_flags= (uint16_t)strtol(optarg, (char **)NULL, 16);\r
       break;\r
     case OPT_EXPIRE: /* --expire */\r
-      opt_expires= (time_t)strtol(optarg, (char **)NULL, 10);\r
+      opt_expires= (time_t)strtoll(optarg, (char **)NULL, 10);\r
       break;\r
     case OPT_SET:\r
       opt_method= OPT_SET;\r