Making some modifications to the C++ interface. Mainly going from const char

[m6w6/libmemcached] / libmemcached / memcached.hh

diff --git a/libmemcached/memcached.hh b/libmemcached/memcached.hh
index 5687956671f4d2e91f26858b887abee4fbda1431..55b099453a0c43203e1d388bb0c1313581a40492 100644 (file)
--- a/libmemcached/memcached.hh
+++ b/libmemcached/memcached.hh
@@ -1,11 +1,9 @@
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface                       /* gcc class implementation */
-#endif
-
-#include <memcached.h>
+#include "libmemcached/memcached.h"
 #include <string.h>
 #include <stdio.h>
 
+#include <string>
+
 class Memcached
 {
   memcached_st memc;
@@ -13,41 +11,73 @@ class Memcached
 
 public:
 
-  Memcached() : memc(), result()
+  Memcached() 
+    : 
+      memc(),
+      result()
   {
     memcached_create(&memc);
   }
 
-  Memcached(memcached_st *clone) : memc(), result()
+  Memcached(memcached_st *clone) 
+    : 
+      memc(),
+      result()
   {
     memcached_clone(&memc, clone);
   }
-  char *fetch (char *key, size_t *key_length, size_t *value_length)
+
+  ~Memcached()
+  {
+    memcached_free(&memc);
+  }
+
+  std::string fetch(const std::string& key, size_t *key_length, size_t *value_length)
   {
     uint32_t flags;
     memcached_return rc;
+    std::string ret_val;
 
-    return memcached_fetch(&memc, key, key_length,
-                    value_length, &flags, &rc);
+    char *value= memcached_fetch(&memc, const_cast<char *>(key.c_str()), key_length,
+                                 value_length, &flags, &rc);
+    if (value)
+    {
+      ret_val.assign(value);
+    }
+    return ret_val;
   }
-  char *get(const char *key, size_t *value_length)
+
+  std::string get(const std::string& key, size_t *value_length)
   {
     uint32_t flags;
     memcached_return rc;
+    std::string ret_val;
 
-    return memcached_get(&memc, key, strlen(key),
-                         value_length, &flags, &rc);
+    char *value= memcached_get(&memc, key.c_str(), key.length(),
+                               value_length, &flags, &rc);
+    if (value)
+    {
+      ret_val.assign(value);
+    }
+    return ret_val;
   }
 
-  char *get_by_key(const char *master_key, const char *key, 
+  std::string get_by_key(const std::string& master_key, 
+                   const std::string& key, 
                    size_t *value_length)
   {
     uint32_t flags;
     memcached_return rc;
+    std::string ret_val;
 
-    return memcached_get_by_key(&memc, master_key, strlen(master_key), 
-                                key, strlen(key),
-                                value_length, &flags, &rc);
+    char *value= memcached_get_by_key(&memc, master_key.c_str(), master_key.length(), 
+                                      key.c_str(), key.length(),
+                                      value_length, &flags, &rc);
+    if (value)
+    {
+      ret_val.assign(value);
+    }
+    return ret_val;
   }
 
   memcached_return mget(char **keys, size_t *key_length, 
@@ -57,28 +87,32 @@ public:
     return memcached_mget(&memc, keys, key_length, number_of_keys);
   }
 
-  memcached_return set(const char *key, const char *value, size_t value_length)
+  memcached_return set(const std::string& key, const char *value, size_t value_length)
   {
-    return memcached_set(&memc, key, strlen(key),
+    return memcached_set(&memc, key.c_str(), key.length(),
                          value, value_length,
                          time_t(0), uint32_t(0));
   }
 
-  memcached_return set_by_key(const char *master_key, const char *key, 
+  memcached_return set_by_key(const std::string& master_key, 
+                              const std::string& key, 
                               const char *value, size_t value_length)
   {
-    return memcached_set_by_key(&memc, master_key, strlen(master_key),
-                         key, strlen(key),
-                         value, value_length,
-                         time_t(0),
-                         uint32_t(0) );
+    return memcached_set_by_key(&memc, master_key.c_str(), 
+                                master_key.length(),
+                                key.c_str(), key.length(),
+                                value, value_length,
+                                time_t(0),
+                                uint32_t(0));
   }
+
   memcached_return
-    increment(const char *key, unsigned int offset, uint64_t *value)
+    increment(const std::string& key, unsigned int offset, uint64_t *value)
   {
-    return memcached_increment(&memc, key, strlen(key),
+    return memcached_increment(&memc, key.c_str(), key.length(),
                          offset, value);
   }
+
   memcached_return
     decrement(const char *key, unsigned int offset, uint64_t *value)
   {
@@ -91,6 +125,7 @@ public:
   {
     return memcached_add(&memc, key, strlen(key), value, value_length, 0, 0);
   }
+
   memcached_return add_by_key(const char *master_key, const char *key, 
                               const char *value, size_t value_length)
   {
@@ -107,6 +142,7 @@ public:
                      value, value_length,
                      0, 0);
   }
+
   memcached_return replace_by_key(const char *master_key, const char *key, 
                                   const char *value, size_t value_length)
   {
@@ -121,6 +157,7 @@ public:
     return memcached_prepend(&memc, key, strlen(key),
                     value, value_length, 0, 0);
   }
+
   memcached_return prepend_by_key(const char *master_key, const char *key, 
                                   const char *value, size_t value_length)
   {
@@ -137,6 +174,7 @@ public:
     return memcached_append(&memc, key, strlen(key),
                     value, value_length, 0, 0);
   }
+
   memcached_return  append_by_key(const char *master_key, const char *key, 
                                   const char *value, size_t value_length)
   {
@@ -145,35 +183,35 @@ public:
                                    key, strlen(key),
                                    value, value_length, 0, 0);
   }
+
   memcached_return  cas(const char *key, const char *value, 
-                        size_t value_length, uint64_t cas)
+                        size_t value_length, uint64_t cas_arg)
   {
     return memcached_cas(&memc, key, strlen(key),
-                    value, value_length, 0, 0, cas);
+                    value, value_length, 0, 0, cas_arg);
   }
+
   memcached_return  cas_by_key(const char *master_key, const char *key, 
                                const char *value, size_t value_length, 
-                               uint64_t cas)
+                               uint64_t cas_arg)
   {
     return memcached_cas_by_key(&memc,
                                 master_key, strlen(master_key),
                                 key, strlen(key),
                                 value, value_length,
-                                0, 0, cas);
+                                0, 0, cas_arg);
   }
+
   // using 'remove' vs. 'delete' since 'delete' is a keyword 
   memcached_return remove(const char *key)
   {
     return memcached_delete (&memc, key, strlen(key), 0);
 
   }
+
   memcached_return delete_by_key(const char *master_key, const char *key)
   {
     return memcached_delete_by_key(&memc, master_key, strlen(master_key),
                            key, strlen(key), 0);
   }
-  ~Memcached()
-  {
-    memcached_free(&memc);
-  }
 };