rrd_file = rrd_open(infilename, &rrdold, RRD_READWRITE | RRD_COPY);
if (rrd_file == NULL) {
- rrd_set_error("could not open RRD");
+ rrd_free(&rrdold);
return (-1);
}
if (LockRRD(rrd_file->fd) != 0) {
rrd_set_error("could not lock original RRD");
rrd_free(&rrdold);
- close(rrd_file->fd);
+ rrd_close(rrd_file);
return (-1);
}
if (target_rra >= rrdold.stat_head->rra_cnt) {
rrd_set_error("no such RRA in this RRD");
rrd_free(&rrdold);
- close(rrd_file->fd);
+ rrd_close(rrd_file);
return (-1);
}
if ((long) rrdold.rra_def[target_rra].row_cnt <= -modify) {
rrd_set_error("This RRA is not that big");
rrd_free(&rrdold);
- close(rrd_file->fd);
+ rrd_close(rrd_file);
return (-1);
}
if (rrd_out_file == NULL) {
rrd_set_error("Can't create '%s': %s", outfilename,
rrd_strerror(errno));
+ rrd_free(&rrdnew);
return (-1);
}
if (LockRRD(rrd_out_file->fd) != 0) {
rrd_set_error("could not lock new RRD");
rrd_free(&rrdold);
- close(rrd_file->fd);
- close(rrd_out_file->fd);
+ rrd_close(rrd_file);
+ rrd_close(rrd_out_file);
return (-1);
}
/*XXX: do one write for those parts of header that are unchanged */
sizeof(rra_ptr_t) * rrdnew.stat_head->rra_cnt);
rrd_free(&rrdold);
- close(rrd_file->fd);
rrd_close(rrd_file);
rrd_free(&rrdnew);
- close(rrd_out_file->fd);
rrd_close(rrd_out_file);
return (0);