X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_fetch.c;h=1317483b110adf49478d71b509b6b1c446ef4440;hb=9cd66f2d7fbf16ca07e1709cd156ae78cd0da278;hp=994c03c9858c0b718235f53bf62a6477fbddbad4;hpb=7383625ce0413ce5dbcc0ced4ee4873c6df37735;p=rrdtool.git diff --git a/src/rrd_fetch.c b/src/rrd_fetch.c index 994c03c..1317483 100644 --- 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.3rc7 Copyright by Tobi Oetiker, 1997-2008 ***************************************************************************** * rrd_fetch.c read date from an rrd to use for further processing ***************************************************************************** @@ -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 */ - 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; @@ -277,8 +277,6 @@ int rrd_fetch_fn( 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 &&