X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.hh;h=55b099453a0c43203e1d388bb0c1313581a40492;hb=71e7ddb8865ac660dfa6c1f5c11204aa90ba075f;hp=3bbcaf0bbf9fdec56b20e3d26d8c9d70f8358970;hpb=2b312deb8b7b3f662b492f94a13e673723387724;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached.hh b/libmemcached/memcached.hh
index 3bbcaf0b..55b09945 100644
--- 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,171 +11,207 @@ class Memcached
 
 public:
 
-  Memcached()
+  Memcached() 
+    : 
+      memc(),
+      result()
   {
     memcached_create(&memc);
   }
 
-  Memcached(memcached_st *clone)
+  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(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(char *master_key, char *key, size_t *value_length)
+  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, unsigned int number_of_keys)
+  memcached_return mget(char **keys, size_t *key_length, 
+                        unsigned int number_of_keys)
   {
 
     return memcached_mget(&memc, keys, key_length, number_of_keys);
   }
 
-  memcached_return set(char *key, 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);
+                         time_t(0), uint32_t(0));
   }
 
-  memcached_return set_by_key(char *master_key, char *key, char *value, size_t value_length)
+  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(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(char *key, unsigned int offset, uint64_t *value)
+    decrement(const char *key, unsigned int offset, uint64_t *value)
   {
     return memcached_decrement(&memc, key, strlen(key),
                          offset, value);
   }
 
 
-  memcached_return add(char *key, char *value, size_t value_length)
+  memcached_return add(const char *key, const char *value, size_t value_length)
   {
-    return memcached_add(&memc, key, strlen(key),
-                 value, value_length,
-                 (time_t)0, (uint32_t)0);
+    return memcached_add(&memc, key, strlen(key), value, value_length, 0, 0);
   }
-  memcached_return add_by_key(char *master_key, char *key, char *value, size_t value_length)
+
+  memcached_return add_by_key(const char *master_key, const char *key, 
+                              const char *value, size_t value_length)
   {
     return memcached_add_by_key(&memc, master_key, strlen(master_key),
                                 key, strlen(key),
                                 value, value_length,
-                                (time_t)0, (uint32_t)0);
+                                0, 0);
   }
 
-  memcached_return replace(char *key, char *value, size_t value_length)
+  memcached_return replace(const char *key, const char *value, 
+                           size_t value_length)
   {
     return memcached_replace(&memc, key, strlen(key),
                      value, value_length,
-                     (time_t)0, (uint32_t)0);
+                     0, 0);
   }
-  memcached_return replace_by_key(char *master_key,
-                                  char *key, char *value, size_t value_length)
+
+  memcached_return replace_by_key(const char *master_key, const char *key, 
+                                  const char *value, size_t value_length)
   {
     return memcached_replace_by_key(&memc, master_key, strlen(master_key),
                                     key, strlen(key),
-                                    value, value_length,
-                                    (time_t)0, (uint32_t)0);
+                                    value, value_length, 0, 0);
   }
 
-  memcached_return prepend(char *key, char *value, size_t value_length)
+  memcached_return prepend(const char *key, const char *value, 
+                           size_t value_length)
   {
     return memcached_prepend(&memc, key, strlen(key),
-                    value, value_length,
-                    (time_t)0,
-                    (uint32_t)0);
+                    value, value_length, 0, 0);
   }
-  memcached_return prepend_by_key(char *master_key,
-                                  char *key, char *value, size_t value_length)
+
+  memcached_return prepend_by_key(const char *master_key, const char *key, 
+                                  const char *value, size_t value_length)
   {
     return memcached_prepend_by_key(&memc, master_key, strlen(master_key),
                                     key, strlen(key),
                                     value, value_length,
-                                    (time_t)0,
-                                    (uint32_t)0);
+                                    0,
+                                    0);
   }
 
-  memcached_return  append(char *key, char *value, size_t value_length)
+  memcached_return  append(const char *key, const char *value, 
+                           size_t value_length)
   {
     return memcached_append(&memc, key, strlen(key),
-                    value, value_length,
-                    (time_t)0,
-                    (uint32_t)0);
+                    value, value_length, 0, 0);
   }
-  memcached_return  append_by_key(char *master_key,
-                                  char *key, char *value, size_t value_length)
+
+  memcached_return  append_by_key(const char *master_key, const char *key, 
+                                  const char *value, size_t value_length)
   {
     return memcached_append_by_key(&memc,
                                    master_key, strlen(master_key),
                                    key, strlen(key),
-                                   value, value_length,
-                                   (time_t)0,
-                                   (uint32_t)0);
+                                   value, value_length, 0, 0);
   }
-  memcached_return  cas(char *key, char *value, size_t value_length, uint64_t cas)
+
+  memcached_return  cas(const char *key, const char *value, 
+                        size_t value_length, uint64_t cas_arg)
   {
     return memcached_cas(&memc, key, strlen(key),
-                    value, value_length,
-                    (time_t)0,
-                    (uint32_t)0,
-                    cas);
+                    value, value_length, 0, 0, cas_arg);
   }
-  memcached_return  cas_by_key(char *master_key, char *key, char *value,
-                               size_t value_length, uint64_t cas)
+
+  memcached_return  cas_by_key(const char *master_key, const char *key, 
+                               const char *value, size_t value_length, 
+                               uint64_t cas_arg)
   {
     return memcached_cas_by_key(&memc,
                                 master_key, strlen(master_key),
                                 key, strlen(key),
                                 value, value_length,
-                                (time_t)0,
-                                (uint32_t)0,
-                                cas);
+                                0, 0, cas_arg);
   }
+
   // using 'remove' vs. 'delete' since 'delete' is a keyword 
-  memcached_return remove(char *key)
+  memcached_return remove(const char *key)
   {
-    return memcached_delete (&memc, key, strlen(key), (time_t)0);
+    return memcached_delete (&memc, key, strlen(key), 0);
 
   }
-  memcached_return delete_by_key(char *master_key, char *key)
+
+  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), (time_t)0);
+                           key, strlen(key), 0);
   }
- ~Memcached()
- {
-   memcached_free(&memc);
- }
 };