aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Vivier <lvivier@redhat.com>2016-05-31 18:36:01 +0200
committerMichael Tokarev <mjt@tls.msk.ru>2016-06-07 18:19:25 +0300
commit806956834a898c0d068f116b58e72b0c5e226840 (patch)
treedebe25a9c2e6b1feee6924089be0be4257f994c1
parent66c68a12ae688d16c4037cbe730109108edaf84c (diff)
slirp: Use DIV_ROUND_UP
Replace (((n) + (d) - 1) /(d)) by DIV_ROUND_UP(n,d). This patch is the result of coccinelle script scripts/coccinelle/round.cocci CC: Samuel Thibault <samuel.thibault@ens-lyon.org> Signed-off-by: Laurent Vivier <lvivier@redhat.com> Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
-rw-r--r--slirp/dnssearch.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/slirp/dnssearch.c b/slirp/dnssearch.c
index 4c70a64359..8fb563321b 100644
--- a/slirp/dnssearch.c
+++ b/slirp/dnssearch.c
@@ -261,7 +261,7 @@ int translate_dnssearch(Slirp *s, const char **names)
}
/* reserve extra 2 header bytes for each 255 bytes of output */
- memreq += ((memreq + MAX_OPT_LEN - 1) / MAX_OPT_LEN) * OPT_HEADER_LEN;
+ memreq += DIV_ROUND_UP(memreq, MAX_OPT_LEN) * OPT_HEADER_LEN;
result = g_malloc(memreq * sizeof(*result));
outptr = result;
@@ -288,7 +288,7 @@ int translate_dnssearch(Slirp *s, const char **names)
domain_mkxrefs(domains, domains + num_domains - 1, 0);
memreq = domain_compactify(domains, num_domains);
- blocks = (memreq + MAX_OPT_LEN - 1) / MAX_OPT_LEN;
+ blocks = DIV_ROUND_UP(memreq, MAX_OPT_LEN);
bsrc_end = memreq;
bsrc_start = (blocks - 1) * MAX_OPT_LEN;
bdst_start = bsrc_start + blocks * OPT_HEADER_LEN;