diff options
author | deraadt <> | 2006-03-31 05:35:44 +0000 |
---|---|---|
committer | deraadt <> | 2006-03-31 05:35:44 +0000 |
commit | 0de1827576d6b24781d52765f7acbc94f1ad673d (patch) | |
tree | 14a635684f014a5b8499089b5211bd802f3c82c7 | |
parent | fb4439fe76e56b9eca2788957cbb72c606cba0cb (diff) | |
download | openbsd-0de1827576d6b24781d52765f7acbc94f1ad673d.tar.gz openbsd-0de1827576d6b24781d52765f7acbc94f1ad673d.tar.bz2 openbsd-0de1827576d6b24781d52765f7acbc94f1ad673d.zip |
(char)to{upper,lower}()
-rw-r--r-- | src/lib/libc/net/nsap_addr.c | 8 | ||||
-rw-r--r-- | src/lib/libc/string/strcasestr.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libc/net/nsap_addr.c b/src/lib/libc/net/nsap_addr.c index 50e3bdda95..8cfe86f475 100644 --- a/src/lib/libc/net/nsap_addr.c +++ b/src/lib/libc/net/nsap_addr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: nsap_addr.c,v 1.6 2005/08/06 20:30:03 espie Exp $ */ | 1 | /* $OpenBSD: nsap_addr.c,v 1.7 2006/03/31 05:35:44 deraadt Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1996 by Internet Software Consortium. | 4 | * Copyright (c) 1996 by Internet Software Consortium. |
@@ -25,7 +25,7 @@ | |||
25 | #include <ctype.h> | 25 | #include <ctype.h> |
26 | #include <resolv.h> | 26 | #include <resolv.h> |
27 | 27 | ||
28 | static char | 28 | static u_char |
29 | xtob(int c) | 29 | xtob(int c) |
30 | { | 30 | { |
31 | return (c - (((c >= '0') && (c <= '9')) ? '0' : '7')); | 31 | return (c - (((c >= '0') && (c <= '9')) ? '0' : '7')); |
@@ -43,11 +43,11 @@ inet_nsap_addr(const char *ascii, u_char *binary, int maxlen) | |||
43 | if (!isascii(c)) | 43 | if (!isascii(c)) |
44 | return (0); | 44 | return (0); |
45 | if (islower(c)) | 45 | if (islower(c)) |
46 | c = toupper(c); | 46 | c = (u_char)toupper(c); |
47 | if (isxdigit(c)) { | 47 | if (isxdigit(c)) { |
48 | nib = xtob(c); | 48 | nib = xtob(c); |
49 | if ((c = *ascii++)) { | 49 | if ((c = *ascii++)) { |
50 | c = toupper(c); | 50 | c = (u_char)toupper(c); |
51 | if (isxdigit(c)) { | 51 | if (isxdigit(c)) { |
52 | *binary++ = (nib << 4) | xtob(c); | 52 | *binary++ = (nib << 4) | xtob(c); |
53 | len++; | 53 | len++; |
diff --git a/src/lib/libc/string/strcasestr.c b/src/lib/libc/string/strcasestr.c index 07c8c2e8fb..aa74c0176d 100644 --- a/src/lib/libc/string/strcasestr.c +++ b/src/lib/libc/string/strcasestr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: strcasestr.c,v 1.2 2005/08/08 08:05:37 espie Exp $ */ | 1 | /* $OpenBSD: strcasestr.c,v 1.3 2006/03/31 05:34:55 deraadt Exp $ */ |
2 | /* $NetBSD: strcasestr.c,v 1.2 2005/02/09 21:35:47 kleink Exp $ */ | 2 | /* $NetBSD: strcasestr.c,v 1.2 2005/02/09 21:35:47 kleink Exp $ */ |
3 | 3 | ||
4 | /*- | 4 | /*- |
@@ -46,7 +46,7 @@ strcasestr(const char *s, const char *find) | |||
46 | size_t len; | 46 | size_t len; |
47 | 47 | ||
48 | if ((c = *find++) != 0) { | 48 | if ((c = *find++) != 0) { |
49 | c = tolower((unsigned char)c); | 49 | c = (char)tolower((unsigned char)c); |
50 | len = strlen(find); | 50 | len = strlen(find); |
51 | do { | 51 | do { |
52 | do { | 52 | do { |