projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve wording
[rrdtool.git]
/
src
/
rrd_fetch.c
diff --git
a/src/rrd_fetch.c
b/src/rrd_fetch.c
index
618f3d3
..
c065793
100644
(file)
--- a/
src/rrd_fetch.c
+++ b/
src/rrd_fetch.c
@@
-69,14
+69,18
@@
int rrd_fetch(
char ***ds_namv, /* names of data sources */
rrd_value_t **data)
{ /* two dimensional array containing the data */
char ***ds_namv, /* names of data sources */
rrd_value_t **data)
{ /* two dimensional array containing the data */
-
-
long step_tmp = 1;
time_t start_tmp = 0, end_tmp = 0;
const char *cf;
struct rrd_time_value start_tv, end_tv;
char *parsetime_error = NULL;
long step_tmp = 1;
time_t start_tmp = 0, end_tmp = 0;
const char *cf;
struct rrd_time_value start_tv, end_tv;
char *parsetime_error = NULL;
+ struct option long_options[] = {
+ {"resolution", required_argument, 0, 'r'},
+ {"start", required_argument, 0, 's'},
+ {"end", required_argument, 0, 'e'},
+ {0, 0, 0, 0}
+ };
optind = 0;
opterr = 0; /* initialize getopt */
optind = 0;
opterr = 0; /* initialize getopt */
@@
-86,12
+90,6
@@
int rrd_fetch(
parsetime("now", &end_tv);
while (1) {
parsetime("now", &end_tv);
while (1) {
- static struct option long_options[] = {
- {"resolution", required_argument, 0, 'r'},
- {"start", required_argument, 0, 's'},
- {"end", required_argument, 0, 'e'},
- {0, 0, 0, 0}
- };
int option_index = 0;
int opt;
int option_index = 0;
int opt;
@@
-430,7
+428,7
@@
int rrd_fetch_fn(
POSIX_FADV_DONTNEED)) {
rrd_set_error("setting POSIX_FADV_DONTNEED on '%s': %s",
filename, rrd_strerror(errno));
POSIX_FADV_DONTNEED)) {
rrd_set_error("setting POSIX_FADV_DONTNEED on '%s': %s",
filename, rrd_strerror(errno));
- goto err_close;/*XXX: should use err_free_all_ds_namv */
+ goto err_close;
/*XXX: should use err_free_all_ds_namv */
}
#endif
}
#endif
@@
-454,22
+452,22
@@
int rrd_fetch_fn(
POSIX_FADV_DONTNEED)) {
rrd_set_error("setting POSIX_FADV_DONTNEED on '%s': %s", filename,
rrd_strerror(errno));
POSIX_FADV_DONTNEED)) {
rrd_set_error("setting POSIX_FADV_DONTNEED on '%s': %s", filename,
rrd_strerror(errno));
- goto err_free; /*XXX: should use err_free_all_ds_namv */
+ goto err_free;
/*XXX: should use err_free_all_ds_namv */
}
#endif
rrd_close(rrd_file);
return (0);
}
#endif
rrd_close(rrd_file);
return (0);
-err_free_data:
+
err_free_data:
free(*data);
*data = NULL;
free(*data);
*data = NULL;
-err_free_all_ds_namv:
- for (i = 0; (unsigned long)i < rrd.stat_head->ds_cnt; ++i)
+
err_free_all_ds_namv:
+ for (i = 0; (unsigned long)
i < rrd.stat_head->ds_cnt; ++i)
free((*ds_namv)[i]);
free((*ds_namv)[i]);
-err_free_ds_namv:
+
err_free_ds_namv:
free(*ds_namv);
free(*ds_namv);
-err_close:
+
err_close:
rrd_close(rrd_file);
rrd_close(rrd_file);
-err_free:
+
err_free:
rrd_free(&rrd);
return (-1);
}
rrd_free(&rrd);
return (-1);
}