[git commit] libbb: use BUILD_BUG_ON in utoa_to_buf()

Denys Vlasenko vda.linux at googlemail.com
Wed Mar 28 15:12:56 UTC 2018


commit: https://git.busybox.net/busybox/commit/?id=e4defe826be49b8ef19912ba4cb291bfe9166e0f
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 libbb/xfuncs.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 43ae98065..e8c027f17 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -59,24 +59,23 @@ char* FAST_FUNC strncpy_IFNAMSIZ(char *dst, const char *src)
  * A truncated result contains the first few digits of the result ala strncpy.
  * Returns a pointer past last generated digit, does _not_ store NUL.
  */
-void BUG_sizeof(void);
 char* FAST_FUNC utoa_to_buf(unsigned n, char *buf, unsigned buflen)
 {
 	unsigned i, out, res;
 
 	if (buflen) {
 		out = 0;
+
+		BUILD_BUG_ON(sizeof(n) != 4 && sizeof(n) != 8);
 		if (sizeof(n) == 4)
 		// 2^32-1 = 4294967295
 			i = 1000000000;
-#if UINT_MAX > 4294967295 /* prevents warning about "const too large" */
+#if UINT_MAX > 0xffffffff /* prevents warning about "const too large" */
 		else
 		if (sizeof(n) == 8)
 		// 2^64-1 = 18446744073709551615
 			i = 10000000000000000000;
 #endif
-		else
-			BUG_sizeof();
 		for (; i; i /= 10) {
 			res = n / i;
 			n = n % i;


More information about the busybox-cvs mailing list