X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_restore.c;h=a0ef6359c1e7be1298832687325521feb2b546c1;hb=d3eec82445206ea746d15049164893b8a71af6b7;hp=e24cc8e990d2ac4cf8f466241555c5d26f7a8db4;hpb=37b2687fdcdd310be0aa5d622426e04820f92d3c;p=rrdtool.git

diff --git a/src/rrd_restore.c b/src/rrd_restore.c
index e24cc8e..a0ef635 100644
--- a/src/rrd_restore.c
+++ b/src/rrd_restore.c
@@ -405,12 +405,11 @@ rrd_write(char *file_name, rrd_t *rrd)
     FILE             *rrd_file=NULL;
 
     if (strcmp("-",file_name)==0){
-      *rrd_file= *stdout;
+      rrd_file= stdout;
     } else {
       int fd = open(file_name,O_RDWR|O_CREAT|O_EXCL,0666);
       if (fd == -1 || (rrd_file = fdopen(fd,"wb")) == NULL) {
-	rrd_set_error("creating '%s': %s",file_name,strerror(errno));
-	rrd_free(rrd);
+	rrd_set_error("creating '%s': %s",file_name,rrd_strerror(errno));
         if (fd != -1)
           close(fd);
 	return(-1);
@@ -513,6 +512,7 @@ rrd_restore(int argc, char **argv)
 
 /* a backwards compatibility routine that will parse the RRA params section
  * generated by the aberrant patch to 1.0.28. */
+
 void
 parse_patch1028_RRA_params(char **buf, rrd_t *rrd, int rra_index)
 {
@@ -557,7 +557,7 @@ parse_FAILURES_history(char **buf, rrd_t *rrd, int rra_index, int ds_index)
 {
    char history[MAX_FAILURES_WINDOW_LEN + 1];
    char *violations_array;
-   short i;
+   unsigned short i;
 
    /* 28 = MAX_FAILURES_WINDOW_LEN */ 
    read_tag(buf, "history", "%28[0-1]", history);