cppcheck warnings fixed.

[m6w6/libmemcached] / clients / ms_setting.h

diff --git a/clients/ms_setting.h b/clients/ms_setting.h
index f558dd32fe837214b7971d8c0a51803a0f80782c..ec060c4103d9a83930e5881f1cef1d2f29b38516 100644 (file)
--- a/clients/ms_setting.h
+++ b/clients/ms_setting.h
@@ -88,7 +88,7 @@ typedef enum cmd_type
 {
   CMD_SET,
   CMD_GET,
-  CMD_NULL,
+  CMD_NULL
 } ms_cmd_type_t;
 
 /* types in the configuration file */
@@ -97,7 +97,7 @@ typedef enum conf_type
   CONF_KEY,
   CONF_VALUE,
   CONF_CMD,
-  CONF_NULL,
+  CONF_NULL
 } ms_conf_type_t;
 
 /* information of command distribution */
@@ -110,8 +110,8 @@ typedef struct cmd_distr
 /* global setting structure */
 typedef struct setting
 {
-  int ncpu;                             /* cpu count of this system */
-  int nthreads;                         /* total thread count, must equal or less than cpu cores */
+  uint32_t ncpu;                             /* cpu count of this system */
+  uint32_t nthreads;                         /* total thread count, must equal or less than cpu cores */
   uint32_t nconns;                      /* total conn count, must multiply by total thread count */
   int64_t exec_num;                     /* total execute number */
   int run_time;                         /* total run time */
@@ -124,8 +124,8 @@ typedef struct setting
   char *cfg_file;                       /* configure file name */
 
   ms_mcd_server_t *servers;             /* servers array */
-  int total_srv_cnt;                    /* total servers count of the servers array */
-  int srv_cnt;                          /* servers count */
+  uint32_t total_srv_cnt;                    /* total servers count of the servers array */
+  uint32_t srv_cnt;                          /* servers count */
 
   ms_key_distr_t *key_distr;            /* array of key distribution */
   int total_key_rng_cnt;                /* total key range count of the array */
@@ -152,10 +152,10 @@ typedef struct setting
   bool reconnect;                       /* whether it reconnect when connection close */
   bool verbose;                         /* whether it outputs detailed information when verification */
   bool facebook_test;                   /* facebook test, TCP set and multi-get with UDP */
-  int sock_per_conn;                    /* number of socks per connection structure */
-  bool binary_prot;                     /* whether it use binary protocol */
+  uint32_t sock_per_conn;                    /* number of socks per connection structure */
+  bool binary_prot_;                     /* whether it use binary protocol */
   int expected_tps;                     /* expected throughput */
-  int rep_write_srv;                    /* which servers are used to do replication writing */
+  uint32_t rep_write_srv;                    /* which servers are used to do replication writing */
 } ms_setting_st;
 
 extern ms_setting_st ms_setting;