projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prepare for the release of rrdtool-1.2.18
[rrdtool.git]
/
src
/
rrd_first.c
diff --git
a/src/rrd_first.c
b/src/rrd_first.c
index
85dff4b
..
c63db36
100644
(file)
--- a/
src/rrd_first.c
+++ b/
src/rrd_first.c
@@
-1,5
+1,5
@@
/*****************************************************************************
/*****************************************************************************
- * RRDtool 1.2.
7 Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.
18 Copyright by Tobi Oetiker, 1997-2006
*****************************************************************************
* rrd_first Return
*****************************************************************************
*****************************************************************************
* rrd_first Return
*****************************************************************************
@@
-24,7
+24,6
@@
rrd_first(int argc, char **argv)
};
int option_index = 0;
int opt;
};
int option_index = 0;
int opt;
- optind = 0; opterr = 0; /* initialize getopt */
opt = getopt_long(argc, argv, "", long_options, &option_index);
if(opt == EOF)
opt = getopt_long(argc, argv, "", long_options, &option_index);
if(opt == EOF)
@@
-69,6
+68,8
@@
rrd_first_r(const char *filename, const int rraindex)
if((rraindex < 0) || (rraindex >= (int)rrd.stat_head->rra_cnt)) {
rrd_set_error("invalid rraindex number");
if((rraindex < 0) || (rraindex >= (int)rrd.stat_head->rra_cnt)) {
rrd_set_error("invalid rraindex number");
+ rrd_free(&rrd);
+ fclose(in_file);
return(-1);
}
return(-1);
}