From fd6c96ccaf7a0ae31c94d5ecd0cd519468018f47 Mon Sep 17 00:00:00 2001
From: Tobias Oetiker <tobi@oetiker.ch>
Date: Sun, 15 Jun 2014 22:35:04 +0200
Subject: [PATCH] eliminate double calls to setlocale

---
 src/rrd_create.c  | 3 +--
 src/rrd_dump.c    | 4 +---
 src/rrd_graph.c   | 3 +--
 src/rrd_rpncalc.c | 3 +--
 src/rrd_tool.c    | 3 +--
 src/rrd_tune.c    | 9 +++------
 src/rrd_update.c  | 9 +++------
 7 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/src/rrd_create.c b/src/rrd_create.c
index a5c1294e..ef1ede45 100644
--- a/src/rrd_create.c
+++ b/src/rrd_create.c
@@ -595,8 +595,7 @@ void parseGENERIC_DS(
        &(rrd -> ds_def[ds_idx].par[DS_mrhb_cnt].u_cnt),
        minstr,maxstr);
      */
-    old_locale = setlocale(LC_NUMERIC, NULL);
-    setlocale(LC_NUMERIC, "C");
+    old_locale = setlocale(LC_NUMERIC, "C");
     if (sscanf(def, "%lu:%18[^:]:%18[^:]",
                &(rrd->ds_def[ds_idx].par[DS_mrhb_cnt].u_cnt),
                minstr, maxstr) == 3) {
diff --git a/src/rrd_dump.c b/src/rrd_dump.c
index 36a66b1d..4b614a44 100644
--- a/src/rrd_dump.c
+++ b/src/rrd_dump.c
@@ -103,9 +103,7 @@ int rrd_dump_cb_r(
         return (-1);
     }
 
-    old_locale = setlocale(LC_NUMERIC, NULL);
-    setlocale(LC_NUMERIC, "C");
-
+    old_locale = setlocale(LC_NUMERIC, "C");
 
     if (opt_header == 1) {
         CB_PUTS("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 3468ea95..7db9897a 100644
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -3977,8 +3977,7 @@ rrd_info_t *rrd_graph_v(
     char *old_locale;
     rrd_graph_init(&im);
     /* a dummy surface so that we can measure text sizes for placements */
-    old_locale = setlocale(LC_NUMERIC, NULL);
-    setlocale(LC_NUMERIC, "C");
+    old_locale = setlocale(LC_NUMERIC, "C");
     rrd_graph_options(argc, argv, &im);
     if (rrd_test_error()) {
         rrd_info_free(im.grinfo);
diff --git a/src/rrd_rpncalc.c b/src/rrd_rpncalc.c
index c847ee4b..0920fce3 100644
--- a/src/rrd_rpncalc.c
+++ b/src/rrd_rpncalc.c
@@ -301,8 +301,7 @@ rpnp_t   *rpn_parse(
     char      vname[MAX_VNAME_LEN + 10];
     char     *old_locale;
 
-    old_locale = setlocale(LC_NUMERIC, NULL);
-    setlocale(LC_NUMERIC, "C");
+    old_locale = setlocale(LC_NUMERIC, "C");
 
     rpnp = NULL;
     expr = (char *) expr_const;
diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index 07316a45..598222d4 100644
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -727,8 +727,7 @@ int HandleInputLine(
         if (rrd_xport
             (argc - 1, &argv[1], &xxsize, &start, &end, &step, &col_cnt,
              &legend_v, &data) == 0) {
-            char *old_locale = setlocale(LC_NUMERIC,NULL);
-            setlocale(LC_NUMERIC, "C");
+            char *old_locale = setlocale(LC_NUMERIC,"C");
             row_cnt = (end - start) / step;
             ptr = data;
             if (json == 0){
diff --git a/src/rrd_tune.c b/src/rrd_tune.c
index d4b8b4ef..6979132f 100644
--- a/src/rrd_tune.c
+++ b/src/rrd_tune.c
@@ -126,8 +126,7 @@ int rrd_tune(
         optcnt++;
         switch (opt) {
         case 'h':
-            old_locale = setlocale(LC_NUMERIC, NULL);
-            setlocale(LC_NUMERIC, "C");
+            old_locale = setlocale(LC_NUMERIC, "C");
             if ((matches =
                  sscanf(optarg, DS_NAM_FMT ":%ld", ds_nam,
                         &heartbeat)) != 2) {
@@ -147,8 +146,7 @@ int rrd_tune(
             break;
 
         case 'i':
-            old_locale = setlocale(LC_NUMERIC, NULL);
-            setlocale(LC_NUMERIC, "C");
+            old_locale = setlocale(LC_NUMERIC, "C");
             if ((matches =
                  sscanf(optarg, DS_NAM_FMT ":%lf", ds_nam, &min)) < 1) {
                 rrd_set_error("invalid arguments for minimum ds value");
@@ -170,8 +168,7 @@ int rrd_tune(
             break;
 
         case 'a':
-            old_locale = setlocale(LC_NUMERIC, NULL);
-            setlocale(LC_NUMERIC, "C");
+            old_locale = setlocale(LC_NUMERIC, "C");
             if ((matches =
                  sscanf(optarg, DS_NAM_FMT ":%lf", ds_nam, &max)) < 1) {
                 rrd_set_error("invalid arguments for maximum ds value");
diff --git a/src/rrd_update.c b/src/rrd_update.c
index 1dba9ed6..0796d30f 100644
--- a/src/rrd_update.c
+++ b/src/rrd_update.c
@@ -970,8 +970,7 @@ static int get_time_from_reading(
         *current_time = tmp_time.tv_sec;
         *current_time_usec = tmp_time.tv_usec;
     } else {
-        old_locale = setlocale(LC_NUMERIC, NULL);
-        setlocale(LC_NUMERIC, "C");
+        old_locale = setlocale(LC_NUMERIC, "C");
         errno = 0;
         tmp = strtod(updvals[0], 0);
         if (errno > 0) {
@@ -1083,8 +1082,7 @@ static int update_pdp_prep(
                 }
                 break;
             case DST_ABSOLUTE:
-                old_locale = setlocale(LC_NUMERIC, NULL);
-                setlocale(LC_NUMERIC, "C");
+                old_locale = setlocale(LC_NUMERIC, "C");
                 errno = 0;
                 pdp_new[ds_idx] = strtod(updvals[ds_idx + 1], &endptr);
                 if (errno > 0) {
@@ -1102,8 +1100,7 @@ static int update_pdp_prep(
                 rate = pdp_new[ds_idx] / interval;
                 break;
             case DST_GAUGE:
-                old_locale = setlocale(LC_NUMERIC, NULL);
-                setlocale(LC_NUMERIC, "C");
+                old_locale = setlocale(LC_NUMERIC, "C");
                 errno = 0;
                 pdp_new[ds_idx] =
                     strtod(updvals[ds_idx + 1], &endptr) * interval;
-- 
2.47.2