projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed indentation ... gnu indent results are not realy beautifl. I might switch...
[rrdtool.git]
/
src
/
rrd_fetch.c
diff --git
a/src/rrd_fetch.c
b/src/rrd_fetch.c
index
994c03c
..
baa0cf3
100644
(file)
--- a/
src/rrd_fetch.c
+++ b/
src/rrd_fetch.c
@@
-1,5
+1,5
@@
/*****************************************************************************
/*****************************************************************************
- * RRDtool 1.
2.99907080300 Copyright by Tobi Oetiker, 1997-2007
+ * RRDtool 1.
3.1 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_fetch.c read date from an rrd to use for further processing
*****************************************************************************
*****************************************************************************
* rrd_fetch.c read date from an rrd to use for further processing
*****************************************************************************
@@
-73,7
+73,7
@@
int rrd_fetch(
time_t start_tmp = 0, end_tmp = 0;
const char *cf;
time_t start_tmp = 0, end_tmp = 0;
const char *cf;
-
struct rrd_time_value
start_tv, end_tv;
+
rrd_time_value_t
start_tv, end_tv;
char *parsetime_error = NULL;
struct option long_options[] = {
{"resolution", required_argument, 0, 'r'},
char *parsetime_error = NULL;
struct option long_options[] = {
{"resolution", required_argument, 0, 'r'},
@@
-86,8
+86,8
@@
int rrd_fetch(
opterr = 0; /* initialize getopt */
/* init start and end time */
opterr = 0; /* initialize getopt */
/* init start and end time */
- parsetime("end-24h", &start_tv);
- parsetime("now", &end_tv);
+
rrd_
parsetime("end-24h", &start_tv);
+
rrd_
parsetime("now", &end_tv);
while (1) {
int option_index = 0;
while (1) {
int option_index = 0;
@@
-100,13
+100,13
@@
int rrd_fetch(
switch (opt) {
case 's':
switch (opt) {
case 's':
- if ((parsetime_error = parsetime(optarg, &start_tv))) {
+ if ((parsetime_error =
rrd_
parsetime(optarg, &start_tv))) {
rrd_set_error("start time: %s", parsetime_error);
return -1;
}
break;
case 'e':
rrd_set_error("start time: %s", parsetime_error);
return -1;
}
break;
case 'e':
- if ((parsetime_error = parsetime(optarg, &end_tv))) {
+ if ((parsetime_error =
rrd_
parsetime(optarg, &end_tv))) {
rrd_set_error("end time: %s", parsetime_error);
return -1;
}
rrd_set_error("end time: %s", parsetime_error);
return -1;
}
@@
-121,7
+121,7
@@
int rrd_fetch(
}
}
- if (proc_start_end(&start_tv, &end_tv, &start_tmp, &end_tmp) == -1) {
+ if (
rrd_
proc_start_end(&start_tv, &end_tv, &start_tmp, &end_tmp) == -1) {
return -1;
}
return -1;
}
@@
-260,7
+260,7
@@
int rrd_fetch_fn(
tmp_step_diff = labs(*step - (rrd.stat_head->pdp_step
* rrd.rra_def[i].pdp_cnt));
/* best full match */
tmp_step_diff = labs(*step - (rrd.stat_head->pdp_step
* rrd.rra_def[i].pdp_cnt));
/* best full match */
- if (cal_
end >= *end && cal_
start <= *start) {
+ if (cal_start <= *start) {
if (first_full || (tmp_step_diff < best_full_step_diff)) {
first_full = 0;
best_full_step_diff = tmp_step_diff;
if (first_full || (tmp_step_diff < best_full_step_diff)) {
first_full = 0;
best_full_step_diff = tmp_step_diff;
@@
-277,8
+277,6
@@
int rrd_fetch_fn(
tmp_match = full_match;
if (cal_start > *start)
tmp_match -= (cal_start - *start);
tmp_match = full_match;
if (cal_start > *start)
tmp_match -= (cal_start - *start);
- if (cal_end < *end)
- tmp_match -= (*end - cal_end);
if (first_part ||
(best_match < tmp_match) ||
(best_match == tmp_match &&
if (first_part ||
(best_match < tmp_match) ||
(best_match == tmp_match &&