cppcheck warnings fixed.

diff --git a/clients/memaslap.c b/clients/memaslap.c
index 37e93ec3f9efa3eb15c42ff6b6c0be402982062c..8053775cb3bb6e4565636367c9290ac9a1504401 100644 (file)
--- a/clients/memaslap.c
+++ b/clients/memaslap.c
@@ -594,7 +594,7 @@ static void ms_options_parse(int argc, char *argv[])
       break;
 
     case OPT_BINARY_PROTOCOL:       /* --binary or -B */
-      ms_setting.binary_prot= true;
+      ms_setting.binary_prot_= true;
       break;
 
     case OPT_TPS:       /* --tps or -P */
@@ -800,7 +800,6 @@ static void ms_print_memslap_stats(struct timeval *start_time,
 /* the loop of the main thread, wait the work threads to complete */
 static void ms_monitor_slap_mode()
 {
-  int second= 0;
   struct timeval start_time, end_time;
 
   /* Wait all the threads complete initialization. */
@@ -828,6 +827,7 @@ static void ms_monitor_slap_mode()
   /* running in "run time" mode, user specify run time */
   if (ms_setting.run_time > 0)
   {
+    int second= 0;
     gettimeofday(&start_time, NULL);
     while (1)
     {

diff --git a/clients/memcp.cc b/clients/memcp.cc
index 59bd7478bb780a89d447d9c8949b1381c7342baa..c56a79cdb7eff4109cb0247424b065e8f9a7c577 100644 (file)
--- a/clients/memcp.cc
+++ b/clients/memcp.cc
@@ -207,6 +207,7 @@ int main(int argc, char *argv[])
     if ((file_buffer_ptr= (char *)malloc(sizeof(char) * (size_t)sbuf.st_size)) == NULL)
     {
       std::cerr << "Error allocating file buffer(" << strerror(errno) << ")" << std::endl;
+      close(fd);
       exit(EXIT_FAILURE);
     }
 
@@ -214,12 +215,14 @@ int main(int argc, char *argv[])
     if ((read_length= ::read(fd, file_buffer_ptr, (size_t)sbuf.st_size)) == -1)
     {
       std::cerr << "Error while reading file " << file_buffer_ptr << " (" << strerror(errno) << ")" << std::endl;
+      close(fd);
       exit(EXIT_FAILURE);
     }
 
     if (read_length != sbuf.st_size)
     {
       std::cerr << "Failure while reading file. Read length was not equal to stat() length" << std::endl;
+      close(fd);
       exit(EXIT_FAILURE);
     }
 

diff --git a/clients/ms_conn.c b/clients/ms_conn.c
index 3a6fd8e7da3b4ce269cac9c8e9d4fde4e4d80310..b4d5f673d11df8ce616ec7494f1c3a4dc49faf76 100644 (file)
--- a/clients/ms_conn.c
+++ b/clients/ms_conn.c
@@ -358,7 +358,7 @@ static int ms_conn_init(ms_conn_t *c,
   c->mlget_task.mlget_num= 0;
   c->mlget_task.value_index= -1;         /* default invalid value */
 
-  if (ms_setting.binary_prot)
+  if (ms_setting.binary_prot_)
   {
     c->protocol= binary_prot;
   }

diff --git a/clients/ms_setting.c b/clients/ms_setting.c
index c3444c9aa78b203714d1473560b79a3d59247f0d..3eb4d0e6e9d9a79668f91aef06512864a46de338 100644 (file)
--- a/clients/ms_setting.c
+++ b/clients/ms_setting.c
@@ -683,7 +683,7 @@ static void ms_build_distr()
         exit(1);
       }
 
-      if (! ms_setting.binary_prot
+      if (! ms_setting.binary_prot_
           && ((start_len > MAX_KEY_SIZE) || (end_len > MAX_KEY_SIZE)))
       {
         fprintf(stderr, "key length must be less than 250 bytes.\n");
@@ -880,7 +880,7 @@ static void ms_setting_slapmode_init_pre()
   ms_setting.reconnect= false;
   ms_setting.verbose= false;
   ms_setting.facebook_test= false;
-  ms_setting.binary_prot= false;
+  ms_setting.binary_prot_= false;
   ms_setting.stat_freq= 0;
   ms_setting.srv_str= NULL;
   ms_setting.cfg_file= NULL;

diff --git a/clients/ms_setting.h b/clients/ms_setting.h
index 964dc40077284295db661cbf8285fd604f2030ce..ec060c4103d9a83930e5881f1cef1d2f29b38516 100644 (file)
--- a/clients/ms_setting.h
+++ b/clients/ms_setting.h
@@ -153,7 +153,7 @@ typedef struct setting
   bool verbose;                         /* whether it outputs detailed information when verification */
   bool facebook_test;                   /* facebook test, TCP set and multi-get with UDP */
   uint32_t sock_per_conn;                    /* number of socks per connection structure */
-  bool binary_prot;                     /* whether it use binary protocol */
+  bool binary_prot_;                     /* whether it use binary protocol */
   int expected_tps;                     /* expected throughput */
   uint32_t rep_write_srv;                    /* which servers are used to do replication writing */
 } ms_setting_st;

diff --git a/clients/ms_stats.c b/clients/ms_stats.c
index 49a5ab6e85e1782d10f5dde2e2ea15a6c418a857..8d62a5aaa1ebf1649171fa8955c5d990c0d16592 100644 (file)
--- a/clients/ms_stats.c
+++ b/clients/ms_stats.c
@@ -219,10 +219,6 @@ void ms_dump_format_stats(ms_stat_t *stat,
   double global_std= 0;
   double global_log= 0;
 
-  uint64_t diff_time= 0;
-  uint64_t diff_events= 0;
-  double diff_squares= 0;
-  double diff_log_product= 0;
   double period_average= 0;
   uint64_t period_tps= 0;
   double period_rate= 0;
@@ -241,17 +237,17 @@ void ms_dump_format_stats(ms_stat_t *stat,
                     * global_average) / (double)(events - 1));
   global_log= exp(stat->log_product / (double)events);
 
-  diff_time= stat->total_time - stat->pre_total_time;
-  diff_events= events - stat->pre_events;
+  uint64_t diff_time= stat->total_time - stat->pre_total_time;
+  uint64_t diff_events= events - stat->pre_events;
   if (diff_events >= 1)
   {
     period_average= (double)(diff_time / diff_events);
     period_tps= diff_events / (uint64_t)freq;
     period_rate= (double)diff_events * obj_size / 1024 / 1024 / freq;
-    diff_squares= (double)stat->squares - (double)stat->pre_squares;
+    double diff_squares= (double)stat->squares - (double)stat->pre_squares;
     period_std= sqrt((diff_squares - (double)diff_events * period_average
                       * period_average) / (double)(diff_events - 1));
-    diff_log_product= stat->log_product - stat->pre_log_product;
+    double diff_log_product= stat->log_product - stat->pre_log_product;
     period_log= exp(diff_log_product / (double)diff_events);
   }
 

diff --git a/libmemcached/io.cc b/libmemcached/io.cc
index 837959da5db6696765036ffe5787741c8235658c..866830aa5528d016004e4539a0b010b8f0c5a279 100644 (file)
--- a/libmemcached/io.cc
+++ b/libmemcached/io.cc
@@ -330,7 +330,16 @@ static bool io_flush(org::libmemcached::Instance* ptr,
     WATCHPOINT_ASSERT(ptr->fd != INVALID_SOCKET);
     WATCHPOINT_ASSERT(write_length > 0);
 
-    int flags= with_flush ? MSG_NOSIGNAL|MSG_DONTWAIT : MSG_NOSIGNAL|MSG_DONTWAIT|MSG_MORE;
+    int flags;
+    if (with_flush)
+    {
+      flags= MSG_NOSIGNAL|MSG_DONTWAIT;
+    }
+    else
+    {
+      flags= MSG_NOSIGNAL|MSG_DONTWAIT|MSG_MORE;
+    }
+
     ssize_t sent_length= ::send(ptr->fd, local_write_ptr, write_length, flags);
 
     if (sent_length == SOCKET_ERROR)

diff --git a/libmemcached/server_list.cc b/libmemcached/server_list.cc
index 4b3c62934583e2f260275bcb894a399995dc96f6..8205edc90cf21a2179e0d9528f571c9f5b876774 100644 (file)
--- a/libmemcached/server_list.cc
+++ b/libmemcached/server_list.cc
@@ -89,6 +89,7 @@ memcached_server_list_append_with_weight(memcached_server_list_st ptr,
 #if 0
     *error= memcached_set_errno(*ptr, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT);
 #endif
+    free(new_host_list);
     return NULL;
   }
 

diff --git a/tests/keys.hpp b/tests/keys.hpp
index 54d6e4f5eb0923f454e5a36660d55a1c5b94e785..342346fc4d19217715530f7891f2215747932aa5 100644 (file)
--- a/tests/keys.hpp
+++ b/tests/keys.hpp
@@ -85,7 +85,7 @@ public:
   {
     for (libtest::vchar_ptr_t::iterator iter= _keys.begin();
          iter != _keys.end();
-         iter++)
+         ++iter)
     {
       ::free(*iter);
     }

diff --git a/tests/libmemcached-1.0/all_tests.cc b/tests/libmemcached-1.0/all_tests.cc
index bfa64c24aff64d5957df34b49e488ab16b35a808..8aeac4d9694b5cfa7af03744d2a86c291f2daf3b 100644 (file)
--- a/tests/libmemcached-1.0/all_tests.cc
+++ b/tests/libmemcached-1.0/all_tests.cc
@@ -82,7 +82,7 @@ void get_world(Framework *world)
   else
   {
     // Assume a minimum of 3, and a maximum of 8
-    world->servers().set_servers_to_run(libtest::number_of_cpus() > 3 ? 
+    world->servers().set_servers_to_run((libtest::number_of_cpus() > 3) ? 
                                         std::min(libtest::number_of_cpus(), size_t(8)) : 3);
   }
 

diff --git a/tests/libmemcached-1.0/mem_functions.cc b/tests/libmemcached-1.0/mem_functions.cc
index 04db47289775f73710dba5e08a0498ff323afb33..9fdf6bf3fdd934990ac415bf239d447ce84dddde 100644 (file)
--- a/tests/libmemcached-1.0/mem_functions.cc
+++ b/tests/libmemcached-1.0/mem_functions.cc
@@ -614,7 +614,7 @@ test_return_t memcached_mget_mixed_memcached_get_TEST(memcached_st *memc)
 
   for (libtest::vchar_ptr_t::iterator iter= keys.begin();
        iter != keys.end(); 
-       iter++)
+       ++iter)
   {
     test_compare_hint(MEMCACHED_SUCCESS,
                       memcached_set(memc,