From c74c2411db5f3bf06848008c0d121a23fd31cf91 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 31 Oct 2009 09:42:37 +0100 Subject: [PATCH] inttostr: aesthetics and improved (compile-time) safety Define inttype_is_signed rather than inttype_is_unsigned, since the sole use is via "#if inttype_is_signed". * lib/imaxtostr.c (inttype_is_signed): Define this, rather than inttype_is_unsigned. * lib/offtostr.c (inttype_is_signed): Likewise. * lib/uinttostr.c (inttype_is_signed): Likewise. * lib/umaxtostr.c (inttype_is_signed): Likewise. * lib/inttostr.c (inttostr): Use verify to cross-check the inttype_is_signed value and the signedness of the actual type. * modules/inttostr (Depends-on): Add verify. --- ChangeLog | 14 ++++++++++++++ lib/imaxtostr.c | 1 + lib/inttostr.c | 4 +++- lib/offtostr.c | 1 + lib/uinttostr.c | 2 +- lib/umaxtostr.c | 2 +- modules/inttostr | 1 + 7 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e9515dddee..251829a376 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2009-10-31 Jim Meyering + + inttostr: aesthetics and improved (compile-time) safety + Define inttype_is_signed rather than inttype_is_unsigned, + since the sole use is via "#if inttype_is_signed". + * lib/imaxtostr.c (inttype_is_signed): Define this, rather than + inttype_is_unsigned. + * lib/offtostr.c (inttype_is_signed): Likewise. + * lib/uinttostr.c (inttype_is_signed): Likewise. + * lib/umaxtostr.c (inttype_is_signed): Likewise. + * lib/inttostr.c (inttostr): Use verify to cross-check the + inttype_is_signed value and the signedness of the actual type. + * modules/inttostr (Depends-on): Add verify. + 2009-10-30 Eric Blake build: avoid compiler warnings diff --git a/lib/imaxtostr.c b/lib/imaxtostr.c index 5e87ad526f..34ef96c450 100644 --- a/lib/imaxtostr.c +++ b/lib/imaxtostr.c @@ -1,3 +1,4 @@ #define inttostr imaxtostr #define inttype intmax_t +#define inttype_is_signed 1 #include "inttostr.c" diff --git a/lib/inttostr.c b/lib/inttostr.c index 749aea7f6f..c7c0d736a6 100644 --- a/lib/inttostr.c +++ b/lib/inttostr.c @@ -20,6 +20,7 @@ #include #include "inttostr.h" +#include "verify.h" /* Convert I to a printable string in BUF, which must be at least INT_BUFSIZE_BOUND (INTTYPE) bytes long. Return the address of the @@ -31,7 +32,8 @@ inttostr (inttype i, char *buf) char *p = buf + INT_STRLEN_BOUND (inttype); *p = 0; -#ifndef inttype_is_unsigned + verify (TYPE_SIGNED (inttype) == inttype_is_signed); +#if inttype_is_signed if (i < 0) { do diff --git a/lib/offtostr.c b/lib/offtostr.c index 45196e28a4..3a60c6e744 100644 --- a/lib/offtostr.c +++ b/lib/offtostr.c @@ -1,3 +1,4 @@ #define inttostr offtostr #define inttype off_t +#define inttype_is_signed 1 #include "inttostr.c" diff --git a/lib/uinttostr.c b/lib/uinttostr.c index d6fc9645a6..1662985f40 100644 --- a/lib/uinttostr.c +++ b/lib/uinttostr.c @@ -1,4 +1,4 @@ #define inttostr uinttostr #define inttype unsigned int -#define inttype_is_unsigned +#define inttype_is_signed 0 #include "inttostr.c" diff --git a/lib/umaxtostr.c b/lib/umaxtostr.c index 75346a44f7..914f388d1b 100644 --- a/lib/umaxtostr.c +++ b/lib/umaxtostr.c @@ -1,4 +1,4 @@ #define inttostr umaxtostr #define inttype uintmax_t -#define inttype_is_unsigned +#define inttype_is_signed 0 #include "inttostr.c" diff --git a/modules/inttostr b/modules/inttostr index 56ec6fc563..2c2b76e5bb 100644 --- a/modules/inttostr +++ b/modules/inttostr @@ -13,6 +13,7 @@ m4/inttostr.m4 Depends-on: intprops stdint +verify configure.ac: gl_INTTOSTR -- 2.30.2