diff options
| author |   deraadt <deraadt@openbsd.org> | 2003-07-28 19:15:34 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2003-07-28 19:15:34 +0000 |
| commit | 04e367a696f076f52b51f63ff89d03bf74c24ca4 (patch) | |
| tree | 44e52419ff620346bfa36748718df8fd875896e1 /usr.bin/patch/patch.c | |
| parent | Don't treat consecutive slashes as path components; matches POSIX (diff) | |
| download | wireguard-openbsd-04e367a696f076f52b51f63ff89d03bf74c24ca4.tar.xz wireguard-openbsd-04e367a696f076f52b51f63ff89d03bf74c24ca4.zip | |
minor knf and cleanups; otto ok
Diffstat (limited to 'usr.bin/patch/patch.c')
| -rw-r--r-- | usr.bin/patch/patch.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/patch/patch.c b/usr.bin/patch/patch.c index 3824ac9da15..096a3e8388f 100644 --- a/usr.bin/patch/patch.c +++ b/usr.bin/patch/patch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: patch.c,v 1.29 2003/07/28 18:28:52 otto Exp $ */ +/* $OpenBSD: patch.c,v 1.30 2003/07/28 19:15:34 deraadt Exp $ */ /* * patch - a program to apply diffs to original files @@ -27,7 +27,7 @@ */ #ifndef lint -static const char rcsid[] = "$OpenBSD: patch.c,v 1.29 2003/07/28 18:28:52 otto Exp $"; +static const char rcsid[] = "$OpenBSD: patch.c,v 1.30 2003/07/28 19:15:34 deraadt Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -48,7 +48,7 @@ static const char rcsid[] = "$OpenBSD: patch.c,v 1.29 2003/07/28 18:28:52 otto E #include "inp.h" #include "backupfile.h" -int filemode = 0644; +int filemode = 0644; char buf[MAXLINELEN]; /* general purpose buffer */ @@ -69,7 +69,7 @@ bool toutkeep = FALSE; bool trejkeep = FALSE; #ifdef DEBUGGING -int debug = 0; +int debug = 0; #endif bool force = FALSE; @@ -288,7 +288,7 @@ main(int argc, char *argv[]) } } } while (!skip_rest_of_patch && where == 0 && - ++fuzz <= mymaxfuzz); + ++fuzz <= mymaxfuzz); if (skip_rest_of_patch) { /* just got decided */ fclose(ofp); @@ -862,7 +862,7 @@ dump_line(LINENUM line) s = ifetch(line, 0); if (s == NULL) return; - /* Note: string is not null terminated. */ + /* Note: string is not NUL terminated. */ for (; putc(*s, ofp) != '\n'; s++) ; } @@ -877,8 +877,8 @@ patch_match(LINENUM base, LINENUM offset, LINENUM fuzz) LINENUM iline; LINENUM pat_lines = pch_ptrn_lines() - fuzz; const char *ilineptr; - const char *plineptr; - short plinelen; + const char *plineptr; + short plinelen; for (iline = base + offset + fuzz; pline <= pat_lines; pline++, iline++) { ilineptr = ifetch(iline, offset >= 0); |