diff options
| -rw-r--r-- | usr.sbin/amd/amd/amq_subr.c | 4 | ||||
| -rw-r--r-- | usr.sbin/amd/amd/info_file.c | 6 | ||||
| -rw-r--r-- | usr.sbin/amd/amd/mount_fs.c | 4 | ||||
| -rw-r--r-- | usr.sbin/amd/mk-amd-map/mk-amd-map.c | 8 | ||||
| -rw-r--r-- | usr.sbin/catman/catman.c | 6 | ||||
| -rw-r--r-- | usr.sbin/config/cmd.c | 6 | ||||
| -rw-r--r-- | usr.sbin/faithd/ftp.c | 6 |
7 files changed, 20 insertions, 20 deletions
diff --git a/usr.sbin/amd/amd/amq_subr.c b/usr.sbin/amd/amd/amq_subr.c index 93aec676379..77d95e10daf 100644 --- a/usr.sbin/amd/amd/amq_subr.c +++ b/usr.sbin/amd/amd/amq_subr.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)amq_subr.c 8.1 (Berkeley) 6/6/93 - * $Id: amq_subr.c,v 1.11 2005/02/18 15:51:02 henning Exp $ + * $Id: amq_subr.c,v 1.12 2007/03/20 04:00:32 tedu Exp $ */ /* @@ -215,7 +215,7 @@ struct svc_req *rqstp; /* * Find start of value */ - while (*cp && isascii(*cp) && isspace(*cp)) + while (isascii(*cp) && isspace(*cp)) cp++; root_newmap(s, cp, (char *) 0); diff --git a/usr.sbin/amd/amd/info_file.c b/usr.sbin/amd/amd/info_file.c index 64de27a8288..87f310bbded 100644 --- a/usr.sbin/amd/amd/info_file.c +++ b/usr.sbin/amd/amd/info_file.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)info_file.c 8.1 (Berkeley) 6/6/93 - * $Id: info_file.c,v 1.5 2003/06/02 23:36:51 millert Exp $ + * $Id: info_file.c,v 1.6 2007/03/20 04:00:32 tedu Exp $ */ /* @@ -119,7 +119,7 @@ search_or_reload_file(FILE *fp, char *map, char *key, char **val, mnt_map *m, /* * Find start of key */ - for (kp = key_val; *kp && isascii(*kp) && isspace(*kp); kp++) + for (kp = key_val; isascii(*kp) && isspace(*kp); kp++) ; /* @@ -141,7 +141,7 @@ search_or_reload_file(FILE *fp, char *map, char *key, char **val, mnt_map *m, *cp++ = '\0'; if (fn || (*key == *kp && strcmp(key, kp) == 0)) { - while (*cp && isascii(*cp) && isspace(*cp)) + while (isascii(*cp) && isspace(*cp)) cp++; if (*cp) { /* diff --git a/usr.sbin/amd/amd/mount_fs.c b/usr.sbin/amd/amd/mount_fs.c index 43d95861753..08bc14fb23e 100644 --- a/usr.sbin/amd/amd/mount_fs.c +++ b/usr.sbin/amd/amd/mount_fs.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)mount_fs.c 8.1 (Berkeley) 6/6/93 - * $Id: mount_fs.c,v 1.9 2003/06/02 23:36:51 millert Exp $ + * $Id: mount_fs.c,v 1.10 2007/03/20 04:00:32 tedu Exp $ */ #include "am.h" @@ -217,7 +217,7 @@ nextmntopt(char **p) /* * Skip past white space */ - while (*cp && isspace(*cp)) + while (isspace(*cp)) cp++; /* * Word starts here diff --git a/usr.sbin/amd/mk-amd-map/mk-amd-map.c b/usr.sbin/amd/mk-amd-map/mk-amd-map.c index 3bac267fdd9..6d9c3336591 100644 --- a/usr.sbin/amd/mk-amd-map/mk-amd-map.c +++ b/usr.sbin/amd/mk-amd-map/mk-amd-map.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)mk-amd-map.c 8.1 (Berkeley) 6/28/93 - * $Id: mk-amd-map.c,v 1.8 2004/05/07 15:51:12 millert Exp $ + * $Id: mk-amd-map.c,v 1.9 2007/03/20 04:00:32 tedu Exp $ */ /* @@ -48,7 +48,7 @@ char copyright[] = "\ #endif /* not lint */ #ifndef lint -static char rcsid[] = "$Id: mk-amd-map.c,v 1.8 2004/05/07 15:51:12 millert Exp $"; +static char rcsid[] = "$Id: mk-amd-map.c,v 1.9 2007/03/20 04:00:32 tedu Exp $"; static char sccsid[] = "@(#)mk-amd-map.c 8.1 (Berkeley) 6/28/93"; #endif /* not lint */ @@ -155,7 +155,7 @@ read_file(FILE *fp, char *map, void *db) /* * Find start of key */ - for (kp = key_val; *kp && isascii(*kp) && isspace(*kp); kp++) + for (kp = key_val; isascii(*kp) && isspace(*kp); kp++) ; /* @@ -176,7 +176,7 @@ read_file(FILE *fp, char *map, void *db) */ if (*cp) *cp++ = '\0'; - while (*cp && isascii(*cp) && isspace(*cp)) + while (isascii(*cp) && isspace(*cp)) cp++; if (*kp == '+') { fprintf(stderr, "Can't interpolate %s\n", kp); diff --git a/usr.sbin/catman/catman.c b/usr.sbin/catman/catman.c index f1c5a456966..a73cd478c6f 100644 --- a/usr.sbin/catman/catman.c +++ b/usr.sbin/catman/catman.c @@ -1,4 +1,4 @@ -/* $OpenBSD: catman.c,v 1.7 2003/06/28 20:37:29 deraadt Exp $ */ +/* $OpenBSD: catman.c,v 1.8 2007/03/20 04:00:32 tedu Exp $ */ /* * Copyright (c) 1993 Winning Strategies, Inc. * All rights reserved. @@ -30,7 +30,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: catman.c,v 1.7 2003/06/28 20:37:29 deraadt Exp $"; +static char rcsid[] = "$Id: catman.c,v 1.8 2007/03/20 04:00:32 tedu Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -138,7 +138,7 @@ catman(const char *path, char *section) if (isdigit(*tmp)) { sectlen++; tmp++; - while (*tmp && isdigit(*tmp) == 0) { + while (isdigit(*tmp) == 0) { sectlen++; tmp++; } diff --git a/usr.sbin/config/cmd.c b/usr.sbin/config/cmd.c index 2e9b60329f0..0b9c5d63b22 100644 --- a/usr.sbin/config/cmd.c +++ b/usr.sbin/config/cmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd.c,v 1.13 2004/06/08 20:59:28 mcbride Exp $ */ +/* $OpenBSD: cmd.c,v 1.14 2007/03/20 04:00:32 tedu Exp $ */ /* * Copyright (c) 1999-2001 Mats O Jansson. All rights reserved. @@ -25,7 +25,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: cmd.c,v 1.13 2004/06/08 20:59:28 mcbride Exp $"; +static char rcsid[] = "$OpenBSD: cmd.c,v 1.14 2007/03/20 04:00:32 tedu Exp $"; #endif #include <sys/types.h> @@ -269,7 +269,7 @@ Xtimezone(cmd_t *cmd) c = cmd->args; while ((*c != '\0') && !isspace(*c)) c++; - while ((*c != '\0') && isspace(*c)) + while (isspace(*c)) c++; if (strlen(c) != 0 && number(c, &num) == 0) tz->tz_dsttime = num; diff --git a/usr.sbin/faithd/ftp.c b/usr.sbin/faithd/ftp.c index bb7400ae158..474521f0a33 100644 --- a/usr.sbin/faithd/ftp.c +++ b/usr.sbin/faithd/ftp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftp.c,v 1.14 2005/03/16 05:07:48 itojun Exp $ */ +/* $OpenBSD: ftp.c,v 1.15 2007/03/20 04:00:32 tedu Exp $ */ /* $KAME: ftp.c,v 1.20 2002/09/08 01:12:30 itojun Exp $ */ /* @@ -395,7 +395,7 @@ ftp_copyresult(int src, int dst, enum state state) code = atoi(rbuf); param = p; /* param points to first non-command token, if any */ - while (*param && isspace(*param)) + while (isspace(*param)) param++; if (!*param) param = NULL; @@ -635,7 +635,7 @@ ftp_copycommand(int src, int dst, enum state *state) *q = '\0'; param = p; /* param points to first non-command token, if any */ - while (*param && isspace(*param)) + while (isspace(*param)) param++; if (!*param) param = NULL; |