From 5d5d116e4a0564fb77964fbf5573afa93b49e154 Mon Sep 17 00:00:00 2001 From: jtc Date: Thu, 3 Feb 1994 01:10:49 +0000 Subject: Simplify conversion of "quoted" numeric arguments. --- usr.bin/printf/printf.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) (limited to 'usr.bin/printf/printf.c') diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c index 8f120636ade..58f76388939 100644 --- a/usr.bin/printf/printf.c +++ b/usr.bin/printf/printf.c @@ -41,7 +41,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)printf.c 5.9 (Berkeley) 6/1/90";*/ -static char rcsid[] = "$Id: printf.c,v 1.12 1994/02/03 00:35:18 jtc Exp $"; +static char rcsid[] = "$Id: printf.c,v 1.13 1994/02/03 01:10:49 jtc Exp $"; #endif /* not lint */ #include @@ -459,15 +459,11 @@ getlong() if (!*gargv) return(0L); - if (**gargv == '\"' || **gargv == '\'') { - val = gargv[0][1]; - gargv++; - return val; - } + if (**gargv == '\"' || **gargv == '\'') + return (long) *((*gargv++)+1); errno = 0; val = strtol (*gargv, &ep, 0); - check_conversion(*gargv++, ep); return val; } @@ -479,17 +475,13 @@ getulong() char *ep; if (!*gargv) - return(0L); + return(0UL); - if (**gargv == '\"' || **gargv == '\'') { - val = gargv[0][1]; - gargv++; - return val; - } + if (**gargv == '\"' || **gargv == '\'') + return (unsigned long) *((*gargv++)+1); errno = 0; val = strtoul (*gargv, &ep, 0); - check_conversion(*gargv++, ep); return val; } @@ -503,15 +495,11 @@ getdouble() if (!*gargv) return(0.0); - if (**gargv == '\"' || **gargv == '\'') { - val = gargv[0][1]; - gargv++; - return val; - } + if (**gargv == '\"' || **gargv == '\'') + return (double) *((*gargv++)+1); errno = 0; val = strtod (*gargv, &ep); - check_conversion(*gargv++, ep); return val; } -- cgit