Code

Ignore RRA-end when comparing. coverage.
authoroetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Mon, 25 Feb 2008 07:11:00 +0000 (07:11 +0000)
committeroetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Mon, 25 Feb 2008 07:11:00 +0000 (07:11 +0000)
git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@1300 a5681a0c-68f1-0310-ab6d-d61299d08faa

src/rrd_fetch.c

index 52cb493ca4d6a147feb954f3051b6325f4ab037c..ed799fc97fec358f0c463d2831773fa19ef6f80d 100644 (file)
@@ -259,8 +259,7 @@ fprintf(stderr,"Considering: start %10lu end %10lu step %5lu ",
            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;
@@ -279,8 +278,6 @@ fprintf(stderr,"full match, not best\n");
                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 &&