From 633c18d8302c3f0fda715879716a1a6cb2e21080 Mon Sep 17 00:00:00 2001
From: Brian Aker <brian@tangent.org>
Date: Fri, 29 Jun 2012 21:32:44 -0700
Subject: [PATCH] Fix cppcheck warnings.

---
 example/memcached_light.cc |  3 +-
 libmemcached/allocators.cc |  4 +--
 libmemcached/array.c       | 60 +++++++++++++++++++-------------------
 libmemcached/error.cc      | 13 ++-------
 4 files changed, 36 insertions(+), 44 deletions(-)

diff --git a/example/memcached_light.cc b/example/memcached_light.cc
index c92e5ea2..7a29db26 100644
--- a/example/memcached_light.cc
+++ b/example/memcached_light.cc
@@ -77,7 +77,8 @@ struct options_st {
 
   options_st() :
     service("9999"),
-    is_verbose(false)
+    is_verbose(false),
+    opt_daemon(false)
   {
   }
 };
diff --git a/libmemcached/allocators.cc b/libmemcached/allocators.cc
index aaa66dba..e1c9d780 100644
--- a/libmemcached/allocators.cc
+++ b/libmemcached/allocators.cc
@@ -59,8 +59,8 @@ void *_libmemcached_calloc(const memcached_st *self, size_t nelem, size_t size,
 {
   if (self->allocators.malloc != _libmemcached_malloc)
   {
-     void *ret = _libmemcached_malloc(self, nelem * size, context);
-     if (ret == NULL)
+     void *ret= _libmemcached_malloc(self, nelem * size, context);
+     if (ret)
      {
        memset(ret, 0, nelem * size);
      }
diff --git a/libmemcached/array.c b/libmemcached/array.c
index 5096b187..5f9066ce 100644
--- a/libmemcached/array.c
+++ b/libmemcached/array.c
@@ -49,10 +49,12 @@ struct memcached_array_st
 
 memcached_array_st *memcached_array_clone(struct memcached_st *memc, const memcached_array_st *original)
 {
-  if (not original)
-    return NULL;
+  if (original)
+  {
+    return memcached_strcpy(memc, original->c_str, original->size);
+  }
 
-  return memcached_strcpy(memc, original->c_str, original->size);
+  return NULL;
 }
 
 memcached_array_st *memcached_strcpy(struct memcached_st *memc, const char *str, size_t str_length)
@@ -63,29 +65,23 @@ memcached_array_st *memcached_strcpy(struct memcached_st *memc, const char *str,
 
   memcached_array_st *array= (struct memcached_array_st *)libmemcached_malloc(memc, sizeof(struct memcached_array_st) +str_length +1);
 
-  if (not array)
-    return NULL;
-
-  array->root= memc;
-  array->size= str_length; // We don't count the NULL ending
-  memcpy(array->c_str, str, str_length);
-  array->c_str[str_length]= 0;
+  if (array)
+  {
+    array->root= memc;
+    array->size= str_length; // We don't count the NULL ending
+    memcpy(array->c_str, str, str_length);
+    array->c_str[str_length]= 0;
+  }
 
   return array;
 }
 
 bool memcached_array_is_null(memcached_array_st *array)
 {
-  assert(array);
-  assert(array->root);
-
-  if (not array)
+  if (array)
+  {
     return false;
-
-  if (array->size and array->c_str)
-    return false;
-
-  assert(not array->size and not array->c_str);
+  }
 
   return true;
 }
@@ -104,25 +100,29 @@ memcached_string_t memcached_array_to_string(memcached_array_st *array)
 
 void memcached_array_free(memcached_array_st *array)
 {
-  if (not array)
-    return;
-
-  WATCHPOINT_ASSERT(array->root);
-  libmemcached_free(array->root, array);
+  if (array)
+  {
+    WATCHPOINT_ASSERT(array->root);
+    libmemcached_free(array->root, array);
+  }
 }
 
 size_t memcached_array_size(memcached_array_st *array)
 {
-  if (not array)
-    return 0;
+  if (array)
+  {
+    return array->size;
+  }
 
-  return array->size;
+  return 0;
 }
 
 const char *memcached_array_string(memcached_array_st *array)
 {
-  if (not array)
-    return NULL;
+  if (array)
+  {
+    return array->c_str;
+  }
 
-  return array->c_str;
+  return NULL;
 }
diff --git a/libmemcached/error.cc b/libmemcached/error.cc
index 587e1c8a..62616b30 100644
--- a/libmemcached/error.cc
+++ b/libmemcached/error.cc
@@ -464,19 +464,10 @@ void memcached_error_print(const memcached_st *self)
 
 static void _error_free(memcached_error_t *error)
 {
-  if (not error)
+  if (error)
   {
-    return;
-  }
+    _error_free(error->next);
 
-  _error_free(error->next);
-
-  if (error and error->root)
-  {
-    libmemcached_free(error->root, error);
-  }
-  else if (error)
-  {
     libmemcached_free(error->root, error);
   }
 }
-- 
2.30.2