Added LIBM link-line.

[awesomized/libmemcached] / clients / ms_setting.c

diff --git a/clients/ms_setting.c b/clients/ms_setting.c
index 4791c479b9ba8a26507a63754dcf013aabc88526..2821ec524d2254bbb8713de66ef5e8f45d4d43b3 100644 (file)
--- a/clients/ms_setting.c
+++ b/clients/ms_setting.c
@@ -12,6 +12,7 @@
 #include "config.h"
 
 #include <ctype.h>
+#include <inttypes.h>
 #include <strings.h>
 
 #include "ms_setting.h"
@@ -59,7 +60,7 @@ static void ms_print_setting(void);
 static void ms_setting_slapmode_init_pre(void);
 static void ms_setting_slapmode_init_post(void);
 
-#if defined(__SUNPRO_C)
+#if !defined(HAVE_GETLINE)
 #include <limits.h>
 static ssize_t getline (char **line, size_t *line_size, FILE *fp)
 {
@@ -88,9 +89,7 @@ static ssize_t getline (char **line, size_t *line_size, FILE *fp)
 
   for (;;)
   {
-    char i;
-
-    i = getc(fp);
+    int i= getc(fp);
     if (i == EOF)
     {
       result = -1;
@@ -125,15 +124,15 @@ static ssize_t getline (char **line, size_t *line_size, FILE *fp)
       *line_size= needed;
     }
 
-    (*line)[cur_len]= i;
+    (*line)[cur_len]= (char)i;
     cur_len++;
 
     if (i == delim)
       break;
   }
   (*line)[cur_len] = '\0';
-  result= cur_len ? cur_len : result;
-
+  if (cur_len != 0)
+    return (ssize_t)cur_len;
   return result;
 }
 #endif
@@ -199,7 +198,7 @@ static void ms_get_serverlist(char *str)
     {
       srvs= (ms_mcd_server_t *)realloc(
         ms_setting.servers,
-        (uint64_t)ms_setting.total_srv_cnt
+        (size_t)ms_setting.total_srv_cnt
         * sizeof(ms_mcd_server_t) * 2);
       if (srvs == NULL)
       {
@@ -399,7 +398,7 @@ static void ms_parse_cfg_file(char *cfg_file)
 
         if (nread != EOF)
         {
-          if (sscanf(line, "%lu %lu %lf ", &start_len,
+          if (sscanf(line, "%zu %zu %lf ", &start_len,
                      &end_len, &proportion) != 3)
           {
             conf_type= ms_get_conf_type(line);
@@ -414,7 +413,7 @@ static void ms_parse_cfg_file(char *cfg_file)
           {
             key_distr= (ms_key_distr_t *)realloc(
               ms_setting.key_distr,
-              (uint64_t)ms_setting.
+              (size_t)ms_setting.
                  total_key_rng_cnt * sizeof(ms_key_distr_t) * 2);
             if (key_distr == NULL)
             {
@@ -441,7 +440,7 @@ static void ms_parse_cfg_file(char *cfg_file)
 
         if (nread != EOF)
         {
-          if (sscanf(line, "%lu %lu %lf %lu", &start_len, &end_len,
+          if (sscanf(line, "%zu %zu %lf %zu", &start_len, &end_len,
                      &proportion, &frequence) != 3)
           {
             conf_type= ms_get_conf_type(line);
@@ -458,7 +457,7 @@ static void ms_parse_cfg_file(char *cfg_file)
           {
             val_distr= (ms_value_distr_t *)realloc(
               ms_setting.value_distr,
-              (uint64_t)ms_setting.
+              (size_t)ms_setting.
                  total_val_rng_cnt * sizeof(ms_value_distr_t) * 2);
             if (val_distr == NULL)
             {
@@ -858,9 +857,9 @@ static void ms_print_setting()
   }
   else
   {
-    fprintf(stdout, "execute number: %ld\n", ms_setting.exec_num);
+    fprintf(stdout, "execute number: %" PRId64 "\n", ms_setting.exec_num);
   }
-  fprintf(stdout, "windows size: %ldk\n",
+  fprintf(stdout, "windows size: %" PRId64 "k\n",
           (int64_t)(ms_setting.win_size / 1024));
   fprintf(stdout, "set proportion: set_prop=%.2f\n",
           ms_setting.cmd_distr[CMD_SET].cmd_prop);
@@ -910,7 +909,7 @@ void ms_setting_init_pre()
   ms_setting.run_time= DEFAULT_RUN_TIME;
   ms_setting.total_srv_cnt= MCD_SRVS_NUM_INIT;
   ms_setting.servers= (ms_mcd_server_t *)malloc(
-    (uint64_t)ms_setting.total_srv_cnt
+    (size_t)ms_setting.total_srv_cnt
     * sizeof(ms_mcd_server_t));
   if (ms_setting.servers == NULL)
   {
@@ -929,7 +928,7 @@ static void ms_setting_slapmode_init_post()
 {
   ms_setting.total_key_rng_cnt= KEY_RANGE_COUNT_INIT;
   ms_setting.key_distr= (ms_key_distr_t *)malloc(
-    (uint64_t)ms_setting.total_key_rng_cnt
+    (size_t)ms_setting.total_key_rng_cnt
     * sizeof(ms_key_distr_t));
   if (ms_setting.key_distr == NULL)
   {
@@ -939,7 +938,7 @@ static void ms_setting_slapmode_init_post()
 
   ms_setting.total_val_rng_cnt= VALUE_RANGE_COUNT_INIT;
   ms_setting.value_distr= (ms_value_distr_t *)malloc(
-    (uint64_t)ms_setting.total_val_rng_cnt
+    (size_t)ms_setting.total_val_rng_cnt
     * sizeof(
       ms_value_distr_t));
   if (ms_setting.value_distr == NULL)