mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2024-12-22 16:42:56 -08:00
Code

annoying whitespace found during an audit process

Browse Source
This commit is contained in:
deraadt 2024-08-26 03:49:06 +00:00
parent a3863cb83a
commit c71db3fd5a
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
usr.bin/printf/printf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: printf.c,v 1.27 2021/05/07 14:31:27 martijn Exp $ */ /* $OpenBSD: printf.c,v 1.28 2024/08/26 03:49:06 deraadt Exp $ */
/* /*
* Copyright (c) 1989 The Regents of the University of California. * Copyright (c) 1989 The Regents of the University of California.
@ -113,7 +113,7 @@ main(int argc, char *argv[])
start = fmt++; start = fmt++;
if (*fmt == '%') { if (*fmt == '%') {
putchar ('%'); putchar('%');
break; break;
} else if (*fmt == 'b') { } else if (*fmt == 'b') {
char *p = getstr(); char *p = getstr();
@ -149,7 +149,7 @@ main(int argc, char *argv[])
} }
if (!*fmt) { if (!*fmt) {
warnx ("missing format character"); warnx("missing format character");
return(1); return(1);
} }
@ -206,7 +206,7 @@ main(int argc, char *argv[])
break; break;
} }
default: default:
warnx ("%s: invalid directive", start); warnx("%s: invalid directive", start);
return(1); return(1);
} }
*(fmt + 1) = nextch; *(fmt + 1) = nextch;
@ -217,7 +217,7 @@ main(int argc, char *argv[])
break; break;
default: default:
putchar (*fmt); putchar(*fmt);
break; break;
} }
} }
@ -251,7 +251,7 @@ print_escape_str(const char *str)
value <<= 3; value <<= 3;
value += octtobin(*str); value += octtobin(*str);
} }
putchar (value); putchar(value);
str--; str--;
} else if (*str == 'c') { } else if (*str == 'c') {
return 1; return 1;
@ -260,7 +260,7 @@ print_escape_str(const char *str)
str += print_escape(str); str += print_escape(str);
} }
} else { } else {
putchar (*str); putchar(*str);
} }
str++; str++;
} }
@ -297,7 +297,7 @@ print_escape(const char *str)
value <<= 4; value <<= 4;
value += hextobin(*str); value += hextobin(*str);
} }
putchar (value); putchar(value);
return str - start - 1; return str - start - 1;
/* NOTREACHED */ /* NOTREACHED */
@ -433,7 +433,7 @@ getlong(void)
return (unsigned char) *((*gargv++)+1); return (unsigned char) *((*gargv++)+1);
errno = 0; errno = 0;
val = strtol (*gargv, &ep, 0); val = strtol(*gargv, &ep, 0);
check_conversion(*gargv++, ep); check_conversion(*gargv++, ep);
return val; return val;
} }
@ -451,7 +451,7 @@ getulong(void)
return (unsigned char) *((*gargv++)+1); return (unsigned char) *((*gargv++)+1);
errno = 0; errno = 0;
val = strtoul (*gargv, &ep, 0); val = strtoul(*gargv, &ep, 0);
check_conversion(*gargv++, ep); check_conversion(*gargv++, ep);
return val; return val;
} }
@ -469,7 +469,7 @@ getdouble(void)
return (unsigned char) *((*gargv++)+1); return (unsigned char) *((*gargv++)+1);
errno = 0; errno = 0;
val = strtod (*gargv, &ep); val = strtod(*gargv, &ep);
check_conversion(*gargv++, ep); check_conversion(*gargv++, ep);
return val; return val;
} }
@ -479,9 +479,9 @@ check_conversion(const char *s, const char *ep)
{ {
if (*ep) { if (*ep) {
if (ep == s) if (ep == s)
warnx ("%s: expected numeric value", s); warnx("%s: expected numeric value", s);
else else
warnx ("%s: not completely converted", s); warnx("%s: not completely converted", s);
rval = 1; rval = 1;
} else if (errno == ERANGE) { } else if (errno == ERANGE) {
warnc(ERANGE, "%s", s); warnc(ERANGE, "%s", s);