X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_create.c;h=0fd96cbd575164d133ae4727b38dfbcd67b5c0e5;hb=9386e880a888a8b12db1fb290d4b650399830e98;hp=0d0671fc0dd578d856af77c84a584eba2fb43910;hpb=8ef6cdbdd680e4269a164cd885ec14a161fa3f57;p=rrdtool.git diff --git a/src/rrd_create.c b/src/rrd_create.c index 0d0671f..0fd96cb 100644 --- a/src/rrd_create.c +++ b/src/rrd_create.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2.6 Copyright by Tobi Oetiker, 1997-2005 + * RRDtool 1.2.12 Copyright by Tobi Oetiker, 1997-2005 ***************************************************************************** * rrd_create.c creates new rrds *****************************************************************************/ @@ -95,7 +95,8 @@ rrd_create_r(char *filename, rrd_t rrd; long i; int offset; - char *token,dummychar1,dummychar2; + char *token; + char dummychar1[2], dummychar2[2]; unsigned short token_idx, error_flag, period=0; unsigned long hashed_name; @@ -149,9 +150,9 @@ rrd_create_r(char *filename, switch (sscanf(&argv[i][3], DS_NAM_FMT "%1[:]" DST_FMT "%1[:]%n", rrd.ds_def[rrd.stat_head->ds_cnt].ds_nam, - &dummychar1, + dummychar1, rrd.ds_def[rrd.stat_head->ds_cnt].dst, - &dummychar2, + dummychar2, &offset)) { case 0: case 1: rrd_set_error("Invalid DS name"); break; @@ -553,8 +554,11 @@ rrd_create_fn(char *file_name, rrd_t *rrd) if ((rrd_file = fopen(file_name,"wb")) == NULL ) { rrd_set_error("creating '%s': %s",file_name, rrd_strerror(errno)); free(rrd->stat_head); + rrd->stat_head = NULL; free(rrd->ds_def); + rrd->ds_def = NULL; free(rrd->rra_def); + rrd->rra_def = NULL; return(-1); }