diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-03-15 05:05:37 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-03-15 05:05:37 +0000 |
| commit | da6c1c6aef921ae5d3540bc3d81d080c145c97df (patch) | |
| tree | b5903d955aac5e44e7f58bbfe3c90b4b22fc74e3 /usr.bin | |
| parent | dabd393050e9b1258d79da096fc6c65aceaeb83a (diff) | |
remove some bizzare idioms; ok ray
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/cvs/rcs.c | 6 | ||||
| -rw-r--r-- | usr.bin/cvs/rcsnum.c | 6 | ||||
| -rw-r--r-- | usr.bin/rcs/ci.c | 8 | ||||
| -rw-r--r-- | usr.bin/rcs/rcsclean.c | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/usr.bin/cvs/rcs.c b/usr.bin/cvs/rcs.c index c67c3fb2c5a..c4b77b51f68 100644 --- a/usr.bin/cvs/rcs.c +++ b/usr.bin/cvs/rcs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcs.c,v 1.143 2006/03/11 22:44:11 niallo Exp $ */ +/* $OpenBSD: rcs.c,v 1.144 2006/03/15 05:05:35 deraadt Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -2542,14 +2542,14 @@ rcs_expand_keywords(char *rcsfile, struct rcs_delta *rdp, char *data, * $Keyword$ * $Keyword: value$ */ - for (c = data; *c != '\0' && i < len; *c++) { + for (c = data; *c != '\0' && i < len; c++) { if (*c == '$') { /* remember start of this possible keyword */ start = c; start_offset = start - data; /* first following character has to be alphanumeric */ - *c++; + c++; if (!isalpha(*c)) { c = start; continue; diff --git a/usr.bin/cvs/rcsnum.c b/usr.bin/cvs/rcsnum.c index 72cd3cf1d99..94a8a95c927 100644 --- a/usr.bin/cvs/rcsnum.c +++ b/usr.bin/cvs/rcsnum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsnum.c,v 1.26 2006/03/11 22:44:11 niallo Exp $ */ +/* $OpenBSD: rcsnum.c,v 1.27 2006/03/15 05:05:35 deraadt Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -281,9 +281,9 @@ rcsnum_aton(const char *str, char **ep, RCSNUM *nump) * Look for ".0.x" at the end of the branch number. */ if ((s = strrchr(str, '.')) != NULL) { - *s--; + s--; while (*s != '.') - *s--; + s--; /* * If we have a "magic" branch, adjust it diff --git a/usr.bin/rcs/ci.c b/usr.bin/rcs/ci.c index d0de5a6783f..b671dc713f9 100644 --- a/usr.bin/rcs/ci.c +++ b/usr.bin/rcs/ci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ci.c,v 1.117 2006/03/15 03:29:01 ray Exp $ */ +/* $OpenBSD: ci.c,v 1.118 2006/03/15 05:05:35 deraadt Exp $ */ /* * Copyright (c) 2005, 2006 Niall O'Higgins <niallo@openbsd.org> * All rights reserved. @@ -861,10 +861,10 @@ checkin_keywordscan(char *data, RCSNUM **rev, time_t *date, char **author, i = found = 0; len = strlen(data); - for (c = data; *c != '\0' && i < len; *c++) { + for (c = data; *c != '\0' && i < len; c++) { if (*c == '$') { start = c; - *c++; + c++; if (!isalpha(*c)) { c = start; continue; @@ -933,7 +933,7 @@ checkin_keywordtype(char *keystring) char *p; p = keystring; - *p++; + p++; if (strncmp(p, KW_ID, strlen(KW_ID)) == 0) return (KW_TYPE_ID); else if (strncmp(p, KW_AUTHOR, strlen(KW_AUTHOR)) == 0) diff --git a/usr.bin/rcs/rcsclean.c b/usr.bin/rcs/rcsclean.c index f6cf65660a1..abb2a3f3b15 100644 --- a/usr.bin/rcs/rcsclean.c +++ b/usr.bin/rcs/rcsclean.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsclean.c,v 1.24 2006/03/06 14:59:06 jmc Exp $ */ +/* $OpenBSD: rcsclean.c,v 1.25 2006/03/15 05:05:36 deraadt Exp $ */ /* * Copyright (c) 2005 Joris Vink <joris@openbsd.org> * All rights reserved. @@ -174,7 +174,7 @@ rcsclean_file(char *fname, RCSNUM *rev) c1 = cvs_buf_release(b1); c2 = cvs_buf_release(b2); - for (s1 = c1, s2 = c2; *s1 && *s2; *s1++, *s2++) { + for (s1 = c1, s2 = c2; *s1 && *s2; s1++, s2++) { if (*s1 != *s2) { match = 0; break; |