}
}
-static info_t *write_RRA_row(
+static inline info_t *write_RRA_row(
rrd_file_t *rrd_file,
rrd_t *rrd,
unsigned long rra_idx,
if (rrd_write
(rrd_file,
&(rrd->cdp_prep[cdp_idx].scratch[CDP_scratch_idx].u_val),
- sizeof(rrd_value_t) * 1) != sizeof(rrd_value_t) * 1) {
+ sizeof(rrd_value_t)) != sizeof(rrd_value_t)) {
rrd_set_error("writing rrd: %s", rrd_strerror(errno));
return 0;
}
rrd_file = rrd_open(filename, &rrd, RRD_READWRITE);
if (rrd_file == NULL) {
- goto err_out;
+ goto err_free;
}
/* initialize time */
free(pdp_temp);
free(tmpl_idx);
rrd_free(&rrd);
- close(rrd_file->fd);
+ rrd_close(rrd_file);
return (-1);
}
#ifdef USE_MADVISE
}
rrd_free(&rrd);
- close(rrd_file->fd);
rrd_close(rrd_file);
free(pdp_new);
err_free_updvals:
free(updvals);
err_close:
- rrd_free(&rrd);
- close(rrd_file->fd);
rrd_close(rrd_file);
+ err_free:
+ rrd_free(&rrd);
err_out:
return (-1);
}