projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
usr rrd_free for freeing the rrd structs ... vito caputo
[rrdtool.git]
/
src
/
rrd_create.c
diff --git
a/src/rrd_create.c
b/src/rrd_create.c
index
766b783
..
a5c304f
100644
(file)
--- a/
src/rrd_create.c
+++ b/
src/rrd_create.c
@@
-25,6
+25,13
@@
int rrd_create(
int argc,
char **argv)
{
int argc,
char **argv)
{
+ struct option long_options[] = {
+ {"start", required_argument, 0, 'b'},
+ {"step", required_argument, 0, 's'},
+ {0, 0, 0, 0}
+ };
+ int option_index = 0;
+ int opt;
time_t last_up = time(NULL) - 10;
unsigned long pdp_step = 300;
struct rrd_time_value last_up_tv;
time_t last_up = time(NULL) - 10;
unsigned long pdp_step = 300;
struct rrd_time_value last_up_tv;
@@
-36,14
+43,6
@@
int rrd_create(
opterr = 0; /* initialize getopt */
while (1) {
opterr = 0; /* initialize getopt */
while (1) {
- static struct option long_options[] = {
- {"start", required_argument, 0, 'b'},
- {"step", required_argument, 0, 's'},
- {0, 0, 0, 0}
- };
- int option_index = 0;
- int opt;
-
opt = getopt_long(argc, argv, "b:s:", long_options, &option_index);
if (opt == EOF)
opt = getopt_long(argc, argv, "b:s:", long_options, &option_index);
if (opt == EOF)
@@
-633,12
+632,7
@@
int rrd_create_fn(
if ((rrd_file = fopen(file_name, "wb")) == NULL) {
rrd_set_error("creating '%s': %s", file_name, rrd_strerror(errno));
if ((rrd_file = fopen(file_name, "wb")) == NULL) {
rrd_set_error("creating '%s': %s", file_name, rrd_strerror(errno));
- free(rrd->stat_head);
- rrd->stat_head = NULL;
- free(rrd->ds_def);
- rrd->ds_def = NULL;
- free(rrd->rra_def);
- rrd->rra_def = NULL;
+ rrd_free(rrd);
return (-1);
}
return (-1);
}