X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_create.c;h=90c38d338e9056d57e91f2152c9fc5cf0562d3cc;hb=20ac3f138668d4e0c64ef79849faf9adefec9cb7;hp=78f52d629636a6120b786bf7c086a9b333558de9;hpb=e59507fce724b583cf9ab2c402907bd2c9d3f91e;p=rrdtool.git

diff --git a/src/rrd_create.c b/src/rrd_create.c
index 78f52d6..90c38d3 100644
--- a/src/rrd_create.c
+++ b/src/rrd_create.c
@@ -103,12 +103,14 @@ rrd_create_r(char *filename,
     /* static header */
     if((rrd.stat_head = calloc(1,sizeof(stat_head_t)))==NULL){
 	rrd_set_error("allocating rrd.stat_head");
+	rrd_free(&rrd);
 	return(-1);
     }
 
     /* live header */
     if((rrd.live_head = calloc(1,sizeof(live_head_t)))==NULL){
 	rrd_set_error("allocating rrd.live_head");
+	rrd_free(&rrd);
 	return(-1);
     }
 
@@ -388,6 +390,7 @@ rrd_create_r(char *filename,
                 fprintf(stderr,"Creating HW contingent RRAs\n");
 #endif
                 if (create_hw_contingent_rras(&rrd,period,hashed_name) == -1) {
+                    rrd_set_error("creating contingent RRA");
                     rrd_free(&rrd);
                     return -1;
                 }
@@ -527,7 +530,8 @@ rrd_create_fn(char *file_name, rrd_t *rrd)
 {
     unsigned long    i,ii;
     FILE             *rrd_file;
-    rrd_value_t       unknown = DNAN ;
+    rrd_value_t      *unknown;
+    int	unkn_cnt;
     
     if ((rrd_file = fopen(file_name,"wb")) == NULL ) {
 	rrd_set_error("creating '%s': %s",file_name, rrd_strerror(errno));
@@ -632,17 +636,24 @@ rrd_create_fn(char *file_name, rrd_t *rrd)
     }
     
     /* write the empty data area */
-    for(i=0; 
-	i <  rrd->stat_head->rra_cnt;
-	i++)
-    {
-        for(ii=0; 
-            ii <  rrd->rra_def[i].row_cnt 
-                * rrd->stat_head->ds_cnt;
-            ii++){
-            fwrite(&unknown,sizeof(rrd_value_t),1,rrd_file);
-        }
+    if ((unknown = (rrd_value_t *)malloc(512 * sizeof(rrd_value_t))) == NULL) {
+	rrd_set_error("allocating unknown");
+	rrd_free(rrd);
+	fclose(rrd_file);
+	return(-1);
     }
+    for (i = 0; i < 512; ++i)
+	unknown[i] = DNAN;
+    
+    unkn_cnt = 0;
+    for (i = 0; i < rrd->stat_head->rra_cnt; i++)
+        unkn_cnt += rrd->stat_head->ds_cnt * rrd->rra_def[i].row_cnt;
+		      
+    while (unkn_cnt > 0) {
+	fwrite(unknown, sizeof(rrd_value_t), min(unkn_cnt, 512), rrd_file);
+	unkn_cnt -= 512;
+     }
+    free(unknown);
     
     /* lets see if we had an error */
     if(ferror(rrd_file)){