X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_restore.c;h=68923b54f31b279edfdf59ca93c19890878bbd1d;hb=6384b694bd003c56f462c439551e8af8ce697204;hp=a3d09adb16111d035fbda42ed743b2b2a52e930c;hpb=35f5945e114df7324be00de01bcde77e096a2373;p=rrdtool.git

diff --git a/src/rrd_restore.c b/src/rrd_restore.c
index a3d09ad..68923b5 100644
--- a/src/rrd_restore.c
+++ b/src/rrd_restore.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.0  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.11  Copyright by Tobi Oetiker, 1997-2005
  *****************************************************************************
  * rrd_restore.c  creates new rrd from data dumped by rrd_dump.c
  *****************************************************************************/
@@ -8,7 +8,7 @@
 #include "rrd_rpncalc.h"
 #include <fcntl.h>
 
-#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
 #include <io.h>
 #define open _open
 #define close _close
@@ -132,13 +132,11 @@ int xml2rrd(char* buf, rrd_t* rrd, char rc){
   {
     rrd_set_error("Incompatible file version, detected version %s is bigger than supported version %s\n",
 		  rrd -> stat_head -> version, RRD_VERSION );
-    free(rrd -> stat_head);
     return -1;
   }
   if (atoi(rrd -> stat_head -> version) < 2) 
   {
-    rrd_set_error("Can only restore version >= 2 (Not %s). Dump your rrd using a current rrdtool dump.",  rrd -> stat_head -> version );
-    free(rrd -> stat_head);
+    rrd_set_error("Can only restore version >= 2 (Not %s). Dump your old rrd using a current rrdtool dump.",  rrd -> stat_head -> version );
     return -1;
   }
   rrd->stat_head->float_cookie = FLOAT_COOKIE;
@@ -421,7 +419,7 @@ rrd_write(char *file_name, rrd_t *rrd, char force_overwrite)
     if (strcmp("-",file_name)==0){
       rrd_file= stdout;
     } else {
-#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
       fdflags = O_RDWR|O_BINARY|O_CREAT;
 #else
       fdflags = O_WRONLY|O_CREAT;
@@ -488,6 +486,7 @@ rrd_restore(int argc, char **argv)
 	char			force_overwrite = 0;	
 
     /* init rrd clean */
+    optind = 0; opterr = 0;  /* initialize getopt */
     rrd_init(&rrd);
     if (argc<3) {
 		rrd_set_error("usage rrdtool %s [--range-check/-r] [--force-overwrite/-f] file.xml file.rrd",argv[0]);