inttostr: revert most-recent change

diff --git a/ChangeLog b/ChangeLog
index 5015e22fa62d041ff0136bc04221ebbf0cc0654d..1239a1092b7c1960c45f13ffb1e3d224366c4ce9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,17 +1,3 @@
-2010-10-22  Paul Eggert  <eggert@cs.ucla.edu>
-
-       inttostr: simplify by removing unnecessary redundancy
-       * lib/anytostr.c: Don't include verify.h.
-       (anytostr): Don't verify that TYPE_SIGNED (inttype) equals
-       inttype_is_signed.  Instead, use TYPE_SIGNED (inttype) directly.
-       This removes the need for inttype_is_signed, which was put in to
-       suppress some GCC warnings about conversions.  This rewrite should
-       also suppress those warnings.
-       * lib/imaxtostr.c (inttype_is_signed): Remove; no longer needed.
-       * lib/inttostr.c, lib/offtostr.c, lib/uinttostr.c, lib/umaxtostr.c:
-       Likewise.
-       * modules/inttostr (Depends-on): Remove 'verify'.
-
 2010-10-21  Bruno Haible  <bruno@clisp.org>
 
        nl_langinfo test: Avoid test failure on NetBSD 5.

diff --git a/lib/anytostr.c b/lib/anytostr.c
index a64011f5eea6c610299df9f7db1f916fa14f3789..27ad985024ce55ffa786682334d1366e1667a114 100644 (file)
--- a/lib/anytostr.c
+++ b/lib/anytostr.c
@@ -20,6 +20,7 @@
 #include <config.h>
 
 #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
@@ -28,10 +29,12 @@
 char * __attribute_warn_unused_result__
 anytostr (inttype i, char *buf)
 {
+  verify (TYPE_SIGNED (inttype) == inttype_is_signed);
   char *p = buf + INT_STRLEN_BOUND (inttype);
   *p = 0;
 
-  if (TYPE_SIGNED (inttype) && i < 0)
+#if inttype_is_signed
+  if (i < 0)
     {
       do
         *--p = '0' - i % 10;
@@ -40,6 +43,7 @@ anytostr (inttype i, char *buf)
       *--p = '-';
     }
   else
+#endif
     {
       do
         *--p = '0' + i % 10;

diff --git a/lib/imaxtostr.c b/lib/imaxtostr.c
index b91ac98c4e260a07b8c37ea04a3022f3ed2e5ac1..d2a0429b0d3b682be78d827fa6f5cde91cbfe627 100644 (file)
--- a/lib/imaxtostr.c
+++ b/lib/imaxtostr.c
@@ -1,3 +1,4 @@
 #define anytostr imaxtostr
 #define inttype intmax_t
+#define inttype_is_signed 1
 #include "anytostr.c"

diff --git a/lib/inttostr.c b/lib/inttostr.c
index c96b5ca39be62bdeda4071ce6c46280f458c4449..14db9b8c11f6c426a7bd0d695ccd1da27a6aae9a 100644 (file)
--- a/lib/inttostr.c
+++ b/lib/inttostr.c
@@ -1,3 +1,4 @@
 #define anytostr inttostr
 #define inttype int
+#define inttype_is_signed 1
 #include "anytostr.c"

diff --git a/lib/offtostr.c b/lib/offtostr.c
index 96082aafc0fdcdb4858a2f858575325ddd05fee0..68f2b695be1285b7777155dd6d1d2fef13e8d9b0 100644 (file)
--- a/lib/offtostr.c
+++ b/lib/offtostr.c
@@ -1,3 +1,4 @@
 #define anytostr offtostr
 #define inttype off_t
+#define inttype_is_signed 1
 #include "anytostr.c"

diff --git a/lib/uinttostr.c b/lib/uinttostr.c
index 48fd98f21c5ba521613a84129e9f2c960c2e32eb..21fa3761a90fd1223cd3350d1b20d920ab532e32 100644 (file)
--- a/lib/uinttostr.c
+++ b/lib/uinttostr.c
@@ -1,3 +1,4 @@
 #define anytostr uinttostr
 #define inttype unsigned int
+#define inttype_is_signed 0
 #include "anytostr.c"

diff --git a/lib/umaxtostr.c b/lib/umaxtostr.c
index f95bfc3ee0b7c54c0d80ad9ea521a1999c9c0967..7fd995084e76157d6cd60dae4dc0cbb3e4e7f7d9 100644 (file)
--- a/lib/umaxtostr.c
+++ b/lib/umaxtostr.c
@@ -1,3 +1,4 @@
 #define anytostr umaxtostr
 #define inttype uintmax_t
+#define inttype_is_signed 0
 #include "anytostr.c"

diff --git a/modules/inttostr b/modules/inttostr
index 6bbec2895560537a93eace32579961c74efefe64..495ef25cf57f43c7d8315bb2fcdc5d22aacf0593 100644 (file)
--- a/modules/inttostr
+++ b/modules/inttostr
@@ -14,6 +14,7 @@ m4/inttostr.m4
 Depends-on:
 intprops
 stdint
+verify
 
 configure.ac:
 gl_INTTOSTR