Don't depend on string options to be valid always

updates bz#1650403
Change-Id: Ib5a11e691599ce4bd93c1ed5aca6060592893961
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>

3 files changed, 20 insertions, 19 deletions

diff --git a/xlators/debug/error-gen/src/error-gen.c b/xlators/debug/error-gen/src/error-gen.c
index 3416d63fa20..8901e349e6f 100644
--- a/xlators/debug/error-gen/src/error-gen.c
+++ b/xlators/debug/error-gen/src/error-gen.c
@@ -1396,7 +1396,7 @@ error_gen_priv_dump(xlator_t *this)
 
     gf_proc_dump_write("op_count", "%d", conf->op_count);
     gf_proc_dump_write("failure_iter_no", "%d", conf->failure_iter_no);
-    gf_proc_dump_write("error_no", "%s", conf->error_no);
+    gf_proc_dump_write("error_no", "%d", conf->error_no_int);
     gf_proc_dump_write("random_failure", "%d", conf->random_failure);
 
     UNLOCK(&conf->lock);
@@ -1430,6 +1430,7 @@ reconfigure(xlator_t *this, dict_t *options)
     eg_t *pvt = NULL;
     int32_t ret = 0;
     char *error_enable_fops = NULL;
+    char *error_no = NULL;
     double failure_percent_dbl = 0.0;
 
     if (!this || !this->private)
@@ -1439,10 +1440,10 @@ reconfigure(xlator_t *this, dict_t *options)
 
     ret = -1;
 
-    GF_OPTION_RECONF("error-no", pvt->error_no, options, str, out);
+    GF_OPTION_RECONF("error-no", error_no, options, str, out);
 
-    if (pvt->error_no)
-        pvt->error_no_int = conv_errno_to_int(&pvt->error_no);
+    if (error_no)
+        pvt->error_no_int = conv_errno_to_int(&error_no);
 
     GF_OPTION_RECONF("failure", failure_percent_dbl, options, percent, out);
 
@@ -1466,6 +1467,7 @@ init(xlator_t *this)
     eg_t *pvt = NULL;
     int32_t ret = 0;
     char *error_enable_fops = NULL;
+    char *error_no = NULL;
     double failure_percent_dbl = 0.0;
 
     if (!this->children || this->children->next) {
@@ -1490,10 +1492,10 @@ init(xlator_t *this)
 
     ret = -1;
 
-    GF_OPTION_INIT("error-no", pvt->error_no, str, out);
+    GF_OPTION_INIT("error-no", error_no, str, out);
 
-    if (pvt->error_no)
-        pvt->error_no_int = conv_errno_to_int(&pvt->error_no);
+    if (error_no)
+        pvt->error_no_int = conv_errno_to_int(&error_no);
 
     GF_OPTION_INIT("failure", failure_percent_dbl, percent, out);
 
diff --git a/xlators/debug/error-gen/src/error-gen.h b/xlators/debug/error-gen/src/error-gen.h
index ffa09252d0f..2478cd5b21c 100644
--- a/xlators/debug/error-gen/src/error-gen.h
+++ b/xlators/debug/error-gen/src/error-gen.h
@@ -36,7 +36,6 @@ typedef struct {
      * It's just not worth blowing up the diff by changing it.
      */
     int failure_iter_no;
-    char *error_no;
     int error_no_int;
     gf_boolean_t random_failure;
     gf_lock_t lock;
diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c
index f40b00bba2d..f12191fb8df 100644
--- a/xlators/debug/io-stats/src/io-stats.c
+++ b/xlators/debug/io-stats/src/io-stats.c
@@ -173,7 +173,6 @@ struct ios_conf {
      */
     char *unique_id;
     ios_dump_type_t dump_format;
-    char *dump_format_str;
 };
 
 struct ios_fd {
@@ -3680,15 +3679,15 @@ io_priv(xlator_t *this)
 }
 
 static void
-ios_set_log_format_code(struct ios_conf *conf)
+ios_set_log_format_code(struct ios_conf *conf, char *dump_format_str)
 {
-    if (strcmp(conf->dump_format_str, "json") == 0)
+    if (strcmp(dump_format_str, "json") == 0)
         conf->dump_format = IOS_DUMP_TYPE_JSON_FILE;
-    else if (strcmp(conf->dump_format_str, "text") == 0)
+    else if (strcmp(dump_format_str, "text") == 0)
         conf->dump_format = IOS_DUMP_TYPE_FILE;
-    else if (strcmp(conf->dump_format_str, "dict") == 0)
+    else if (strcmp(dump_format_str, "dict") == 0)
         conf->dump_format = IOS_DUMP_TYPE_DICT;
-    else if (strcmp(conf->dump_format_str, "samples") == 0)
+    else if (strcmp(dump_format_str, "samples") == 0)
         conf->dump_format = IOS_DUMP_TYPE_SAMPLES;
 }
 
@@ -3729,6 +3728,7 @@ reconfigure(xlator_t *this, dict_t *options)
     char *sys_log_str = NULL;
     char *log_format_str = NULL;
     char *logger_str = NULL;
+    char *dump_format_str = NULL;
     int sys_log_level = -1;
     char *log_str = NULL;
     int log_level = -1;
@@ -3773,9 +3773,8 @@ reconfigure(xlator_t *this, dict_t *options)
 
     GF_OPTION_RECONF("ios-sample-interval", conf->ios_sample_interval, options,
                      int32, out);
-    GF_OPTION_RECONF("ios-dump-format", conf->dump_format_str, options, str,
-                     out);
-    ios_set_log_format_code(conf);
+    GF_OPTION_RECONF("ios-dump-format", dump_format_str, options, str, out);
+    ios_set_log_format_code(conf, dump_format_str);
     GF_OPTION_RECONF("ios-sample-buf-size", conf->ios_sample_buf_size, options,
                      int32, out);
     GF_OPTION_RECONF("sys-log-level", sys_log_str, options, str, out);
@@ -3880,6 +3879,7 @@ init(xlator_t *this)
     char *sys_log_str = NULL;
     char *logger_str = NULL;
     char *log_format_str = NULL;
+    char *dump_format_str = NULL;
     int logger = -1;
     int log_format = -1;
     int sys_log_level = -1;
@@ -3940,8 +3940,8 @@ init(xlator_t *this)
     GF_OPTION_INIT("ios-sample-interval", conf->ios_sample_interval, int32,
                    out);
 
-    GF_OPTION_INIT("ios-dump-format", conf->dump_format_str, str, out);
-    ios_set_log_format_code(conf);
+    GF_OPTION_INIT("ios-dump-format", dump_format_str, str, out);
+    ios_set_log_format_code(conf, dump_format_str);
 
     GF_OPTION_INIT("ios-sample-buf-size", conf->ios_sample_buf_size, int32,
                    out);