From 4a4985d51c2272569534457388d6178072f36452 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 10 Aug 2011 19:49:55 +0200 Subject: [PATCH] tally: Adapt divlu64 to Samba coding conventions (Imported from SAMBA commit ee91004f4bddcda873f8ccde1db16609a66a493b) --- ccan/tally/tally.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ccan/tally/tally.c b/ccan/tally/tally.c index a6d66b66..d9f30ba1 100644 --- a/ccan/tally/tally.c +++ b/ccan/tally/tally.c @@ -231,8 +231,9 @@ static uint64_t divlu64(uint64_t u1, uint64_t u0, uint64_t v) uint64_t p; /* Product of two digits. */ int64_t s, i, j, t, k; - if (u1 >= v) /* If overflow, return the largest */ + if (u1 >= v) { /* If overflow, return the largest */ return (uint64_t)-1; /* possible quotient. */ + } s = 64 - fls64(v); /* 0 <= s <= 63. */ vn0 = v << s; /* Normalize divisor. */ @@ -255,7 +256,9 @@ static uint64_t divlu64(uint64_t u1, uint64_t u0, uint64_t v) if (qhat >= b || qhat*vn[0] > b*rhat + un[j]) { qhat = qhat - 1; rhat = rhat + vn[1]; - if (rhat < b) goto again; + if (rhat < b) { + goto again; + } } /* Multiply and subtract. */ -- 2.39.2