From ce1529fb7ace30ac5b61e1079e5b08fd80f38e5b Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 21 Nov 2012 13:04:07 +0100 Subject: [PATCH] Minor refactor of r_pos_x Avoiding redundant declarations and division by zero. --- rset/rsmultiandor.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/rset/rsmultiandor.c b/rset/rsmultiandor.c index f65039a..be47e2b 100644 --- a/rset/rsmultiandor.c +++ b/rset/rsmultiandor.c @@ -619,14 +619,17 @@ static void r_pos_x(RSFD rfd, double *current, double *total, int and_op) double sum_cur = 0.0; double sum_tot = 0.0; for (i = 0; ino_children; i++){ - double nratio, cur, tot; + double cur, tot; rset_pos(mrfd->items[i].fd, &cur, &tot); yaz_log(log_level, "r_pos: %d %0.1f %0.1f", i, cur,tot); - nratio = cur / tot; if (and_op) { - if (nratio > ratio) - ratio = nratio; + if (tot > 0.0) + { + double nratio = cur / tot; + if (nratio > ratio) + ratio = nratio; + } } else { @@ -635,7 +638,7 @@ static void r_pos_x(RSFD rfd, double *current, double *total, int and_op) sum_tot += tot; } } - if (!and_op) + if (!and_op && sum_tot > 0.0) ratio = sum_cur / sum_tot; if (ratio == 0.0 || ratio == 1.0) { /* nothing there */ *current = 0; -- 1.7.10.4