Mercurial > hg > octave-lojdl > gnulib-hg
changeset 13821:1cf23bf4f6e4
inttostr: revert most-recent change
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Fri, 22 Oct 2010 12:42:17 -0700 |
| parents | f44f7159cdc4 |
| children | 03e1d3ecee9a |
| files | ChangeLog lib/anytostr.c lib/imaxtostr.c lib/inttostr.c lib/offtostr.c lib/uinttostr.c lib/umaxtostr.c modules/inttostr |
| diffstat | 8 files changed, 11 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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 @@ *--p = '-'; } else +#endif { do *--p = '0' + i % 10;
--- 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"
--- 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"
--- 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"
--- 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"