| Message ID | 1464712565-14857-13-git-send-email-lvivier@redhat.com |
|---|---|
| State | New |
| Headers | show |
Laurent Vivier, on Tue 31 May 2016 18:36:01 +0200, wrote: > Replace (((n) + (d) - 1) /(d)) by DIV_ROUND_UP(n,d). > > This patch is the result of coccinelle script > scripts/coccinelle/round.cocci > > Signed-off-by: Laurent Vivier <lvivier@redhat.com> Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org> > --- > slirp/dnssearch.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/slirp/dnssearch.c b/slirp/dnssearch.c > index aed2f13..9b16757 100644 > --- a/slirp/dnssearch.c > +++ b/slirp/dnssearch.c > @@ -262,7 +262,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; > @@ -289,7 +289,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; > -- > 2.5.5 >
diff --git a/slirp/dnssearch.c b/slirp/dnssearch.c index aed2f13..9b16757 100644 --- a/slirp/dnssearch.c +++ b/slirp/dnssearch.c @@ -262,7 +262,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; @@ -289,7 +289,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;
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> --- slirp/dnssearch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)