CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-02-13 19:02:02 +02:00
Code Issues Projects Releases Wiki Activity

maint: adjust to recent verify_true removal

Browse Source 
* src/system.h (X2NREALLOC, X2REALLOC, DECIMAL_DIGIT_ACCUMULATE):
Use verify_expr instead of verify_true, which has been removed.
(DECIMAL_DIGIT_ACCUMULATE): Remove unnecessary size check.
This commit is contained in:
Paul Eggert
2019-05-11 09:32:04 -07:00
parent 39073add8f
commit a970a97737
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/system.h
View File

@@ -245,15 +245,15 @@ uid_t getuid (void);
the third argument to x2nrealloc would be 'sizeof *(P)'.
Ensure that sizeof *(P) is *not* 1. In that case, it'd be
better to use X2REALLOC, although not strictly necessary. */
#define X2NREALLOC(P, PN) ((void) verify_true (sizeof *(P) != 1), \
x2nrealloc (P, PN, sizeof *(P)))
#define X2NREALLOC(P, PN) verify_expr (sizeof *(P) != 1, \
x2nrealloc (P, PN, sizeof *(P)))
/* Using x2realloc (when appropriate) usually makes your code more
readable than using x2nrealloc, but it also makes it so your
code will malfunction if sizeof *(P) ever becomes 2 or greater.
So use this macro instead of using x2realloc directly. */
#define X2REALLOC(P, PN) ((void) verify_true (sizeof *(P) == 1), \
x2realloc (P, PN))
#define X2REALLOC(P, PN) verify_expr (sizeof *(P) == 1, \
x2realloc (P, PN))
#include "unlocked-io.h"
#include "same-inode.h"
@@ -567,11 +567,11 @@ is_nul (void const *buf, size_t length)
#define DECIMAL_DIGIT_ACCUMULATE(Accum, Digit_val, Type) \
( \
(void) (&(Accum) == (Type *) NULL), /* The type matches. */ \
(void) verify_true (! TYPE_SIGNED (Type)), /* The type is unsigned. */ \
(void) verify_true (sizeof (Accum) == sizeof (Type)), /* Added check. */ \
(((Type) -1 / 10 < (Accum) \
|| (Type) ((Accum) * 10 + (Digit_val)) < (Accum)) \
? false : (((Accum) = (Accum) * 10 + (Digit_val)), true)) \
verify_expr (! TYPE_SIGNED (Type), /* The type is unsigned. */ \
(((Type) -1 / 10 < (Accum) \
|| (Type) ((Accum) * 10 + (Digit_val)) < (Accum)) \
? false \
: (((Accum) = (Accum) * 10 + (Digit_val)), true))) \
)
static inline void