X-Git-Url: http://git.asbjorn.it/?p=debian%2Fdhcpd-pools.git;a=blobdiff_plain;f=src%2Fanalyze.c;h=c46d5955570b6435e1ba11b6db0364ba9f095c08;hp=7a31699b81f303bdac60e8a8ebdaa869c237796a;hb=ee35f8bb1f94b177675ab84b963a0fe61cd201eb;hpb=e6c32dbdf9d0a0c685f5c402f94e965cf587f062 diff --git a/src/analyze.c b/src/analyze.c index 7a31699..c46d595 100644 --- a/src/analyze.c +++ b/src/analyze.c @@ -61,7 +61,7 @@ int prepare_data(void) &rangecomp); /* Sort backups */ - if (num_backups > 0) { + if (0 < num_backups) { qsort(backups, (size_t) num_backups, sizeof(long int), &intcomp); } @@ -81,9 +81,9 @@ int do_counting(void) /* Walk through ranges */ for (k = 0; k < num_ranges; k++) { /* Count IPs in use */ - for (; range_p->last_ip > leases[i] + for (; leases[i] < range_p->last_ip && (unsigned long) i < num_leases; i++) { - if (range_p->first_ip > leases[i]) { + if (leases[i] < range_p->first_ip) { continue; } /* IP with in range */ @@ -94,9 +94,9 @@ int do_counting(void) } /* Count touched IPs */ - for (; range_p->last_ip > touches[j] + for (; touches[j] < range_p->last_ip && (unsigned long) j < num_touches; j++) { - if (range_p->first_ip > touches[j]) { + if (touches[j] < range_p->first_ip) { continue; } /* IP with in range */ @@ -107,10 +107,10 @@ int do_counting(void) } /* Count backup IPs */ - if (num_backups > 0) { - for (; range_p->last_ip > backups[m] + if (0 < num_backups) { + for (; backups[m] < range_p->last_ip && (unsigned long) m < num_touches; m++) { - if (range_p->first_ip > touches[m]) { + if (touches[m] < range_p->first_ip) { continue; } /* IP with in range */