diff options
author | Eric Andersen <andersen@codepoet.org> | 2003-05-26 22:09:14 +0400 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2003-05-26 22:09:14 +0400 |
commit | a2d1982841adf21442c7574e784a45324e7f1db5 (patch) | |
tree | 72520d9a5d900f4ec220283608fe513e7bf26e43 /coreutils/printf.c | |
parent | fab3e12cec54854ec1e94ddd500a1b7ed23fb1c3 (diff) |
cleanup a bit to remove needless verify() function
Diffstat (limited to 'coreutils/printf.c')
-rw-r--r-- | coreutils/printf.c | 75 |
1 files changed, 36 insertions, 39 deletions
diff --git a/coreutils/printf.c b/coreutils/printf.c index 9602788de..28f8aa45c 100644 --- a/coreutils/printf.c +++ b/coreutils/printf.c @@ -55,6 +55,7 @@ #include <stdlib.h> #include <fcntl.h> #include <ctype.h> +#include <assert.h> #include "busybox.h" @@ -105,14 +106,10 @@ static int print_esc __P((char *escstart)); static int print_formatted __P((char *format, int argc, char **argv)); static long xstrtol __P((char *s)); static unsigned long xstrtoul __P((char *s)); -static void print_direc -__P( - - (char *start, size_t length, int field_width, int precision, - char *argument)); +static void print_direc __P( (char *start, size_t length, + int field_width, int precision, char *argument)); static void print_esc_char __P((int c)); static void print_esc_string __P((char *str)); -static void verify __P((char *s, char *end)); /* The value to return to the calling program. */ static int exit_status; @@ -405,51 +402,51 @@ print_direc(char *start, size_t length, int field_width, int precision, free(p); } -static unsigned long xstrtoul(char *s) +static unsigned long xstrtoul(char *arg) { - char *end; - unsigned long val; + unsigned long result; + char *endptr; + //int errno_save = errno; + + assert(arg!=NULL); errno = 0; - val = strtoul(s, &end, 0); - verify(s, end); - return val; + result = strtoul(arg, &endptr, 10); + if (errno != 0 || *endptr!='\0' || endptr==arg) + fprintf(stderr, "%s", arg); + //errno = errno_save; + return result; } -static long xstrtol(char *s) +static long xstrtol(char *arg) { - char *end; - long val; + long result; + char *endptr; + //int errno_save = errno; + + assert(arg!=NULL); errno = 0; - val = strtol(s, &end, 0); - verify(s, end); - return val; + result = strtoul(arg, &endptr, 10); + if (errno != 0 || *endptr!='\0' || endptr==arg) + fprintf(stderr, "%s", arg); + //errno = errno_save; + return result; } -static double xstrtod(char *s) +static double xstrtod(char *arg) { - char *end; - double val; + double result; + char *endptr; + //int errno_save = errno; + + assert(arg!=NULL); errno = 0; - val = strtod(s, &end); - verify(s, end); - return val; + result = strtod(arg, &endptr); + if (errno != 0 || *endptr!='\0' || endptr==arg) + fprintf(stderr, "%s", arg); + //errno = errno_save; + return result; } -static void verify(char *s, char *end) -{ - if (errno) { - fprintf(stderr, "%s", s); - exit_status = 1; - } else if (*end) { - /* - if (s == end) - fprintf(stderr, "%s: expected numeric", s); - else - fprintf(stderr, "%s: not completely converted", s); - */ - exit_status = 1; - } -} |