X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fbin%2Fmemaslap%2Fms_setting.c;h=9d328ddcf62ae831908c57b89ffd0b91a908aeed;hb=2899ca181d15b8606c3317f3204e7186846e93cf;hp=adab65a1a78a27057299fab6ebaef90d294bf68e;hpb=7c2da91b9897c54f66e7fc634a675fcaeef32167;p=awesomized%2Flibmemcached

diff --git a/src/bin/memaslap/ms_setting.c b/src/bin/memaslap/ms_setting.c
index adab65a1..9d328ddc 100644
--- a/src/bin/memaslap/ms_setting.c
+++ b/src/bin/memaslap/ms_setting.c
@@ -130,7 +130,7 @@ static ssize_t getline(char **line, size_t *line_size, FILE *fp) {
       break;
   }
   (*line)[cur_len] = '\0';
-  if (cur_len != 0)
+  if (cur_len)
     return (ssize_t) cur_len;
   return result;
 }
@@ -236,7 +236,7 @@ ms_conf_type_t ms_get_conf_type(char *line) {
  * @return if success, return EXIT_FAILURE, else return EXIT_SUCCESS
  */
 static int ms_is_line_data(char *line) {
-  assert(line != NULL);
+  assert(line);
 
   char *begin_ptr = line;
 
@@ -446,13 +446,15 @@ static void ms_parse_cfg_file(char *cfg_file) {
       }
       break;
 
-    default: assert(0); break;
+    default:
+      assert(0);
+      break;
     } /* switch */
   }
 
   fclose(f);
 
-  if (line != NULL) {
+  if (line) {
     free(line);
   }
 } /* ms_parse_cfg_file */
@@ -527,7 +529,8 @@ static int ms_shuffle_distr(ms_distr_t *distr, int length) {
       distr[i].value_size = tmp_size;
       break;
 
-    default: break;
+    default:
+      break;
     } /* switch */
   }
 
@@ -623,7 +626,7 @@ static void ms_build_distr() {
   offset = 0;
 
   /* initialize value distribution */
-  if (ms_setting.fixed_value_size != 0) {
+  if (ms_setting.fixed_value_size) {
     for (int i = 0; i < units * UNIT_ITEMS_COUNT; i++) {
       ms_setting.distr[i].value_size = ms_setting.fixed_value_size;
     }
@@ -794,7 +797,7 @@ static void ms_setting_slapmode_init_post() {
   ms_parse_cfg_file(ms_setting.cfg_file);
 
   /* run time mode */
-  if ((ms_setting.exec_num == 0) && (ms_setting.run_time != 0)) {
+  if ((ms_setting.exec_num == 0) && (ms_setting.run_time)) {
     ms_setting.exec_num = (int64_t) MAX_EXEC_NUM;
   } else {
     /* execute number mode */
@@ -867,31 +870,31 @@ void ms_setting_init_post() {
  * clean up the global setting structure
  */
 void ms_setting_cleanup() {
-  if (ms_setting.distr != NULL) {
+  if (ms_setting.distr) {
     free(ms_setting.distr);
   }
 
-  if (ms_setting.char_block != NULL) {
+  if (ms_setting.char_block) {
     free(ms_setting.char_block);
   }
 
-  if (ms_setting.srv_str != NULL) {
+  if (ms_setting.srv_str) {
     free(ms_setting.srv_str);
   }
 
-  if (ms_setting.cfg_file != NULL) {
+  if (ms_setting.cfg_file) {
     free(ms_setting.cfg_file);
   }
 
-  if (ms_setting.servers != NULL) {
+  if (ms_setting.servers) {
     free(ms_setting.servers);
   }
 
-  if (ms_setting.key_distr != NULL) {
+  if (ms_setting.key_distr) {
     free(ms_setting.key_distr);
   }
 
-  if (ms_setting.value_distr != NULL) {
+  if (ms_setting.value_distr) {
     free(ms_setting.value_distr);
   }
 } /* ms_setting_cleanup */