From: Peter Stamfest <peter@stamfest.at>
Date: Thu, 27 Feb 2014 07:41:12 +0000 (+0100)
Subject: factor out rrd file writing in rrd_modify_r
X-Git-Tag: v1.5.0-rc1~131^2~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=00910ef7bb109d27f079f70b2b0c90c7ee280cd5;p=thirdparty%2Frrdtool-1.x.git

factor out rrd file writing in rrd_modify_r
---

diff --git a/src/rrd_modify.c b/src/rrd_modify.c
index e9278a2c..0ae30e35 100644
--- a/src/rrd_modify.c
+++ b/src/rrd_modify.c
@@ -13,6 +13,9 @@
 
 #include <locale.h>
 
+// prototype
+static int write_rrd(const char *outfilename, rrd_t *out);
+
 /* a convenience realloc/memcpy combo  */
 static void * copy_over_realloc(void *dest, int dest_index, 
 				const void *src, int index,
@@ -56,7 +59,6 @@ static int rrd_modify_r(const char *infilename,
     char       *old_locale = NULL;
     char       *ops = NULL;
     unsigned int ops_cnt = 0;
-    char *tmpfile = NULL;
 
     old_locale = setlocale(LC_NUMERIC, NULL);
     setlocale(LC_NUMERIC, "C");
@@ -498,6 +500,29 @@ static int rrd_modify_r(const char *infilename,
 	out_rra++;
     }
 
+    rc = write_rrd(outfilename, &out);
+
+done:
+    /* clean up */
+    if (old_locale) 
+	setlocale(LC_NUMERIC, old_locale);
+
+    if (rrd_file != NULL) {
+	rrd_close(rrd_file);
+    }
+    rrd_free(&in);
+    rrd_free(&out);
+
+    if (ops != NULL) free(ops);
+
+    return rc;
+}
+
+
+static int write_rrd(const char *outfilename, rrd_t *out) {
+    int rc = -1;
+    char *tmpfile = NULL;
+
     /* write out the new file */
     FILE *fh = NULL;
     if (strcmp(outfilename, "-") == 0) {
@@ -528,7 +553,7 @@ static int rrd_modify_r(const char *infilename,
 	}
     }
 
-    rc = write_fh(fh, &out);
+    rc = write_fh(fh, out);
 
     if (fh != NULL && tmpfile != NULL) {
 	/* tmpfile != NULL indicates that we did NOT write to stdout,
@@ -582,22 +607,9 @@ static int rrd_modify_r(const char *infilename,
 	    unlink(tmpfile);
 	}
     }
-
 done:
-    /* clean up */
-    if (old_locale) 
-	setlocale(LC_NUMERIC, old_locale);
-
     if (tmpfile != NULL)
 	free(tmpfile);
-    
-    if (rrd_file != NULL) {
-	rrd_close(rrd_file);
-    }
-    rrd_free(&in);
-    rrd_free(&out);
-
-    if (ops != NULL) free(ops);
 
     return rc;
 }