diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libcurses/tinfo/comp_hash.c | 4 | ||||
| -rw-r--r-- | lib/libform/fty_alnum.c | 8 | ||||
| -rw-r--r-- | lib/libform/fty_alpha.c | 8 | ||||
| -rw-r--r-- | lib/libform/fty_ipv4.c | 4 | ||||
| -rw-r--r-- | lib/libskey/skeylogin.c | 4 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/conf/conf_mod.c | 2 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/ocsp/ocsp_ht.c | 6 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/x509v3/v3_utl.c | 2 |
8 files changed, 19 insertions, 19 deletions
diff --git a/lib/libcurses/tinfo/comp_hash.c b/lib/libcurses/tinfo/comp_hash.c index 172c3fc946a..a4b10f3c546 100644 --- a/lib/libcurses/tinfo/comp_hash.c +++ b/lib/libcurses/tinfo/comp_hash.c @@ -1,4 +1,4 @@ -/* $OpenBSD: comp_hash.c,v 1.6 2003/03/18 16:55:54 millert Exp $ */ +/* $OpenBSD: comp_hash.c,v 1.7 2007/03/20 03:40:06 tedu Exp $ */ /**************************************************************************** * Copyright (c) 1998 Free Software Foundation, Inc. * @@ -216,7 +216,7 @@ static char **parse_columns(char *buffer) col++; if (mark == '\0') break; - while (*++s && isspace(*s)) + while (isspace(*++s)) /*EMPTY*/; buffer = s; } else diff --git a/lib/libform/fty_alnum.c b/lib/libform/fty_alnum.c index 7fb7ee74d2b..61a4fb7ab78 100644 --- a/lib/libform/fty_alnum.c +++ b/lib/libform/fty_alnum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fty_alnum.c,v 1.6 2001/01/22 18:02:16 millert Exp $ */ +/* $OpenBSD: fty_alnum.c,v 1.7 2007/03/20 03:40:05 tedu Exp $ */ /* @@ -90,15 +90,15 @@ static bool Check_AlphaNumeric_Field(FIELD * field, const void * argp) int l = -1; unsigned char *s; - while(*bp && *bp==' ') + while(*bp==' ') bp++; if (*bp) { s = bp; - while(*bp && isalnum(*bp)) + while(isalnum(*bp)) bp++; l = (int)(bp-s); - while(*bp && *bp==' ') + while(*bp==' ') bp++; } return ((*bp || (l < width)) ? FALSE : TRUE); diff --git a/lib/libform/fty_alpha.c b/lib/libform/fty_alpha.c index 579a675c575..34b2a4b4fe8 100644 --- a/lib/libform/fty_alpha.c +++ b/lib/libform/fty_alpha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fty_alpha.c,v 1.6 2001/01/22 18:02:17 millert Exp $ */ +/* $OpenBSD: fty_alpha.c,v 1.7 2007/03/20 03:40:05 tedu Exp $ */ /* @@ -91,15 +91,15 @@ static bool Check_Alpha_Field(FIELD * field, const void * argp) int l = -1; unsigned char *s; - while(*bp && *bp==' ') + while(*bp==' ') bp++; if (*bp) { s = bp; - while(*bp && isalpha(*bp)) + while(isalpha(*bp)) bp++; l = (int)(bp-s); - while(*bp && *bp==' ') + while(*bp==' ') bp++; } return ((*bp || (l < width)) ? FALSE : TRUE); diff --git a/lib/libform/fty_ipv4.c b/lib/libform/fty_ipv4.c index 162c96f9090..0cd429fdefa 100644 --- a/lib/libform/fty_ipv4.c +++ b/lib/libform/fty_ipv4.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fty_ipv4.c,v 1.4 2001/01/22 18:02:17 millert Exp $ */ +/* $OpenBSD: fty_ipv4.c,v 1.5 2007/03/20 03:40:05 tedu Exp $ */ /* @@ -40,7 +40,7 @@ static bool Check_IPV4_Field(FIELD * field, const void * argp GCC_UNUSED) if (num == 4) { bp += len; /* Make bp point to what sscanf() left */ - while (*bp && isspace((unsigned char)*bp)) + while (isspace((unsigned char)*bp)) bp++; /* Allow trailing whitespace */ } } diff --git a/lib/libskey/skeylogin.c b/lib/libskey/skeylogin.c index 6aebd6c5119..74f26346cc8 100644 --- a/lib/libskey/skeylogin.c +++ b/lib/libskey/skeylogin.c @@ -10,7 +10,7 @@ * * S/Key verification check, lookups, and authentication. * - * $OpenBSD: skeylogin.c,v 1.53 2006/04/10 08:06:08 deraadt Exp $ + * $OpenBSD: skeylogin.c,v 1.54 2007/03/20 03:40:06 tedu Exp $ */ #include <sys/param.h> @@ -430,7 +430,7 @@ skey_fakeprompt(char *username, char *skeyprompt) if (gethostname(pbuf, sizeof(pbuf)) == -1) *(p = pbuf) = '.'; else - for (p = pbuf; *p && isalnum(*p); p++) + for (p = pbuf; isalnum(*p); p++) if (isalpha(*p) && isupper(*p)) *p = (char)tolower(*p); if (*p && pbuf - p < 4) diff --git a/lib/libssl/src/crypto/conf/conf_mod.c b/lib/libssl/src/crypto/conf/conf_mod.c index d45adea8513..812e60dc704 100644 --- a/lib/libssl/src/crypto/conf/conf_mod.c +++ b/lib/libssl/src/crypto/conf/conf_mod.c @@ -587,7 +587,7 @@ int CONF_parse_list(const char *list_, int sep, int nospc, { if (nospc) { - while(*lstart && isspace((unsigned char)*lstart)) + while(isspace((unsigned char)*lstart)) lstart++; } p = strchr(lstart, sep); diff --git a/lib/libssl/src/crypto/ocsp/ocsp_ht.c b/lib/libssl/src/crypto/ocsp/ocsp_ht.c index 9213e58ae49..2c481718835 100644 --- a/lib/libssl/src/crypto/ocsp/ocsp_ht.c +++ b/lib/libssl/src/crypto/ocsp/ocsp_ht.c @@ -120,7 +120,7 @@ Content-Length: %d\r\n\r\n"; goto err; } /* Skip past white space to start of response code */ - while(*p && isspace((unsigned char)*p)) p++; + while(isspace((unsigned char)*p)) p++; if(!*p) { OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_SERVER_RESPONSE_PARSE_ERROR); goto err; @@ -137,7 +137,7 @@ Content-Length: %d\r\n\r\n"; retcode = strtoul(p, &r, 10); if(*r) goto err; /* Skip over any leading white space in message */ - while(*q && isspace((unsigned char)*q)) q++; + while(isspace((unsigned char)*q)) q++; if(*q) { /* Finally zap any trailing white space in message (include CRLF) */ /* We know q has a non white space character so this is OK */ @@ -156,7 +156,7 @@ Content-Length: %d\r\n\r\n"; /* Find blank line marking beginning of content */ while(BIO_gets(mem, tmpbuf, 512) > 0) { - for(p = tmpbuf; *p && isspace((unsigned char)*p); p++) continue; + for(p = tmpbuf; isspace((unsigned char)*p); p++) continue; if(!*p) break; } if(*p) { diff --git a/lib/libssl/src/crypto/x509v3/v3_utl.c b/lib/libssl/src/crypto/x509v3/v3_utl.c index 466c91d0e8d..f23a8d29a0a 100644 --- a/lib/libssl/src/crypto/x509v3/v3_utl.c +++ b/lib/libssl/src/crypto/x509v3/v3_utl.c @@ -337,7 +337,7 @@ static char *strip_spaces(char *name) char *p, *q; /* Skip over leading spaces */ p = name; - while(*p && isspace((unsigned char)*p)) p++; + while(isspace((unsigned char)*p)) p++; if(!*p) return NULL; q = p + strlen(p) - 1; while((q != p) && isspace((unsigned char)*q)) q--; |