Turned on more warnings, and fixed the errors. Moved common.h, which includes

[awesomized/libmemcached] / libmemcached / memcached.hh

diff --git a/libmemcached/memcached.hh b/libmemcached/memcached.hh
index 479693a71df2e63807a6d99a920a1e13fd434201..5687956671f4d2e91f26858b887abee4fbda1431 100644 (file)
--- a/libmemcached/memcached.hh
+++ b/libmemcached/memcached.hh
@@ -13,12 +13,12 @@ class Memcached
 
 public:
 
-  Memcached()
+  Memcached() : memc(), result()
   {
     memcached_create(&memc);
   }
 
-  Memcached(memcached_st *clone)
+  Memcached(memcached_st *clone) : memc(), result()
   {
     memcached_clone(&memc, clone);
   }
@@ -61,7 +61,7 @@ public:
   {
     return memcached_set(&memc, key, strlen(key),
                          value, value_length,
-                         (time_t)0, (uint32_t)0);
+                         time_t(0), uint32_t(0));
   }
 
   memcached_return set_by_key(const char *master_key, const char *key, 
@@ -70,8 +70,8 @@ public:
     return memcached_set_by_key(&memc, master_key, strlen(master_key),
                          key, strlen(key),
                          value, value_length,
-                         (time_t)0,
-                         (uint32_t)0 );
+                         time_t(0),
+                         uint32_t(0) );
   }
   memcached_return
     increment(const char *key, unsigned int offset, uint64_t *value)
@@ -89,9 +89,7 @@ public:
 
   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(const char *master_key, const char *key, 
                               const char *value, size_t value_length)
@@ -99,7 +97,7 @@ public:
     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(const char *key, const char *value, 
@@ -107,24 +105,21 @@ public:
   {
     return memcached_replace(&memc, key, strlen(key),
                      value, value_length,
-                     (time_t)0, (uint32_t)0);
+                     0, 0);
   }
   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(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(const char *master_key, const char *key, 
                                   const char *value, size_t value_length)
@@ -132,17 +127,15 @@ public:
     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(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(const char *master_key, const char *key, 
                                   const char *value, size_t value_length)
@@ -150,18 +143,13 @@ public:
     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(const char *key, const char *value, 
                         size_t value_length, uint64_t cas)
   {
     return memcached_cas(&memc, key, strlen(key),
-                    value, value_length,
-                    (time_t)0,
-                    (uint32_t)0,
-                    cas);
+                    value, value_length, 0, 0, cas);
   }
   memcached_return  cas_by_key(const char *master_key, const char *key, 
                                const char *value, size_t value_length, 
@@ -171,20 +159,18 @@ public:
                                 master_key, strlen(master_key),
                                 key, strlen(key),
                                 value, value_length,
-                                (time_t)0,
-                                (uint32_t)0,
-                                cas);
+                                0, 0, cas);
   }
   // using 'remove' vs. 'delete' since 'delete' is a keyword 
   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(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()
   {