X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_restore.c;h=39148e89e80dc490bfd2ab946b91029d02448fba;hp=e1de2870181559da9dc481d1420d588b2293a853;hb=HEAD;hpb=a6fc0fa1cf5e60a0619993adfc8e4eedcebe4b96 diff --git a/src/rrd_restore.c b/src/rrd_restore.c index e1de287..39148e8 100644 --- a/src/rrd_restore.c +++ b/src/rrd_restore.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.4.2 Copyright by Tobi Oetiker, 1997-2009 + * RRDtool 1.4.3 Copyright by Tobi Oetiker, 1997-2010 ***************************************************************************** * rrd_restore.c Contains logic to parse XML input and create an RRD file * This file: @@ -788,7 +788,7 @@ static int parse_tag_rra( /* All space successfully allocated, increment number of RRAs. */ rrd->stat_head->rra_cnt++; - + status = 0; while ((element = get_xml_element(reader)) != NULL){ if (xmlStrcasecmp(element, (const xmlChar *) "cf") == 0) @@ -827,7 +827,7 @@ static int parse_tag_rra( return status; } else if (xmlStrcasecmp(element,(const xmlChar *) "/rra") == 0){ - xmlFree(element); + xmlFree(element); return status; } /* }}} */ else { @@ -1180,15 +1180,16 @@ static int write_file( unsigned long num_rows = rrd->rra_def[i].row_cnt; unsigned long cur_row = rrd->rra_ptr[i].cur_row; unsigned long ds_cnt = rrd->stat_head->ds_cnt; + if (num_rows > 0){ + fwrite(rrd->rrd_value + + (rra_offset + num_rows - 1 - cur_row) * ds_cnt, + sizeof(rrd_value_t), (cur_row + 1) * ds_cnt, fh); - fwrite(rrd->rrd_value + - (rra_offset + num_rows - 1 - cur_row) * ds_cnt, - sizeof(rrd_value_t), (cur_row + 1) * ds_cnt, fh); - - fwrite(rrd->rrd_value + rra_offset * ds_cnt, - sizeof(rrd_value_t), (num_rows - 1 - cur_row) * ds_cnt, fh); + fwrite(rrd->rrd_value + rra_offset * ds_cnt, + sizeof(rrd_value_t), (num_rows - 1 - cur_row) * ds_cnt, fh); - rra_offset += num_rows; + rra_offset += num_rows; + } } /* lets see if we had an error */