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 5b6a6a89dda6b62df21352604e91fd36219426f5..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,9 +37,11 @@
 
 #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[])
 {
@@ -52,18 +54,16 @@ int main(int argc, char *argv[])
 
   for (int x= 1; x < argc; x++)
   {
+    char buffer[BUFSIZ];
     memcached_return_t rc;
-    memcached_st *memc_ptr= memcached_create(NULL);
-    
-    rc= memcached_parse_configuration(memc_ptr, argv[x], strlen(argv[x]));
+    rc= libmemcached_check_configuration(argv[x], strlen(argv[x]), buffer, sizeof(buffer));
 
     if (rc != MEMCACHED_SUCCESS)
     {
-      std::cerr << "Failed to parse options:" << argv[x] << std::endl;
-      memcached_error_print(memc_ptr);
+      std::cerr << "Failed to parse argument #" << x << " " << argv[x] << std::endl;
+      std::cerr << buffer << std::endl;
       return EXIT_FAILURE;
     }
-    memcached_free(memc_ptr);
   }
 
   return EXIT_SUCCESS;