index 0bd3f459ab9d7ac22945c1f2a1e13e5abf17f00f..15810a63d8e3f8edf305b73311494f0d5a87ec46 100644 (file)
--- a/program/src/rrd_first.c
+++ b/program/src/rrd_first.c
/*****************************************************************************
- * RRDtool 1.2.23 Copyright by Tobi Oetiker, 1997-2007
+ * RRDtool 1.4.2 Copyright by Tobi Oetiker, 1997-2009
*****************************************************************************
* rrd_first Return
*****************************************************************************
* Initial version by Burton Strauss, ntopSupport.com - 3/2005
*****************************************************************************/
+#include <stdlib.h>
#include "rrd_tool.h"
{
int target_rraindex = 0;
char *endptr;
+ struct option long_options[] = {
+ {"rraindex", required_argument, 0, 129},
+ {0, 0, 0, 0}
+ };
optind = 0;
opterr = 0; /* initialize getopt */
while (1) {
- static struct option long_options[] = {
- {"rraindex", required_argument, 0, 129},
- {0, 0, 0, 0}
- };
int option_index = 0;
int opt;
const int rraindex)
{
off_t rra_start, timer;
- time_t then;
+ time_t then = -1;
rrd_t rrd;
rrd_file_t *rrd_file;
+ rrd_init(&rrd);
rrd_file = rrd_open(filename, &rrd, RRD_READONLY);
if (rrd_file == NULL) {
- rrd_set_error("could not open RRD");
- return (-1);
+ goto err_free;
}
if ((rraindex < 0) || (rraindex >= (int) rrd.stat_head->rra_cnt)) {
rrd_set_error("invalid rraindex number");
- rrd_free(&rrd);
- close(rrd_file->fd);
- return (-1);
+ goto err_close;
}
rra_start = rrd_file->header_len;
(rra_start +
(rrd.rra_ptr[rraindex].cur_row + 1) *
rrd.stat_head->ds_cnt * sizeof(rrd_value_t)), SEEK_SET);
- timer = -(rrd.rra_def[rraindex].row_cnt - 1);
+ timer = -(long)(rrd.rra_def[rraindex].row_cnt - 1);
if (rrd.rra_ptr[rraindex].cur_row + 1 > rrd.rra_def[rraindex].row_cnt) {
rrd_seek(rrd_file, rra_start, SEEK_SET);
}
rrd.live_head->last_up %
(rrd.rra_def[rraindex].pdp_cnt * rrd.stat_head->pdp_step)) +
(timer * rrd.rra_def[rraindex].pdp_cnt * rrd.stat_head->pdp_step);
-
- rrd_free(&rrd);
- close(rrd_file->fd);
+ err_close:
rrd_close(rrd_file);
+ err_free:
+ rrd_free(&rrd);
return (then);
}