Fix all include location, and drop versions of the library that were never shipped.

[awesomized/libmemcached] / clients / memparse.cc

diff --git a/clients/memparse.cc b/clients/memparse.cc
index 704d7b5272fd9ca57943adece5dbdce276b214f4..ab4cee9eb7d72e949f97b0e3077c412d646dcb19 100644 (file)
--- a/clients/memparse.cc
+++ b/clients/memparse.cc
@@ -2,7 +2,7 @@
  * 
  *  Libmemcached library
  *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *  Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
  *  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
@@ -37,30 +37,33 @@
 
 #include <config.h>
 
+#include <cstdio>
+#include <cstring>
 #include <iostream>
 
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 int main(int argc, char *argv[])
 {
 
-  if (argc != 2)
+  if (argc < 2)
   {
-    std::cerr << "Wrong number of arguments" << std::endl;
+    std::cerr << "No arguments provided." << std::endl;
     return EXIT_FAILURE;
   }
 
-  memcached_st *memc;
-
-  memc= memcached_create(NULL);
-
-  memcached_return_t rc= memcached_parse_configuration(memc, argv[1], strlen(argv[1]));
-  memcached_free(memc);
-
-  if (rc != MEMCACHED_SUCCESS)
+  for (int x= 1; x < argc; x++)
   {
-    std::cerr << "Failed to parse options" << std::endl;
-    return EXIT_FAILURE;
+    char buffer[BUFSIZ];
+    memcached_return_t rc;
+    rc= libmemcached_check_configuration(argv[x], strlen(argv[x]), buffer, sizeof(buffer));
+
+    if (rc != MEMCACHED_SUCCESS)
+    {
+      std::cerr << "Failed to parse argument #" << x << " " << argv[x] << std::endl;
+      std::cerr << buffer << std::endl;
+      return EXIT_FAILURE;
+    }
   }
 
   return EXIT_SUCCESS;