Readjusted a number function names.

[m6w6/libmemcached] / src / memcp.c

diff --git a/src/memcp.c b/src/memcp.c
index ec9a2fafb12a2b1bf88389cb4c6d6585c7ef5b32..0001713d5ecda853e233fa949737620d31de4a42 100644 (file)
--- a/src/memcp.c
+++ b/src/memcp.c
@@ -62,8 +62,8 @@ 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: %x\n expires: %llu\n",\r
-            opstr[opt_method], argv[optind], (size_t)sbuf.st_size,\r
+            "key: %s\nflags: %x\nexpires: %llu\n",\r
+            opstr[opt_method - OPT_SET], argv[optind], (size_t)sbuf.st_size,\r
             ptr, opt_flags, (unsigned long long)opt_expires);\r
     }\r
 \r
@@ -97,7 +97,6 @@ int main(int argc, char *argv[])
       fprintf(stderr, "memcp: %s: memcache error %s\n", \r
              ptr, memcached_strerror(memc, rc));\r
 \r
-    WATCHPOINT;\r
     free(file_buffer_ptr);\r
     close(fd);\r
     optind++;\r
@@ -140,6 +139,12 @@ void options_parse(int argc, char *argv[])
     {\r
     case 0:\r
       break;\r
+    case OPT_VERBOSE: /* --verbose or -v */\r
+      opt_verbose = OPT_VERBOSE;\r
+      break;\r
+    case OPT_DEBUG: /* --debug or -d */\r
+      opt_verbose = OPT_DEBUG;\r
+      break;\r
     case OPT_VERSION: /* --version or -V */\r
       printf("memcache tools, memcp, v1.0\n");\r
       exit(0);\r