diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-08-05 21:47:34 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-08-05 21:47:34 +0000 |
commit | ad98de6f3bde79382fa6454e01e4c1d928dd0b6d (patch) | |
tree | 7408092f96cf8f81439a4a2c0c8be076ba1f8747 /usr.bin | |
parent | 77201bcf7b52541604d623ea5066123d841bce72 (diff) |
spacing
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/grep/grep.c | 4 | ||||
-rw-r--r-- | usr.bin/patch/backupfile.c | 20 | ||||
-rw-r--r-- | usr.bin/patch/inp.c | 8 | ||||
-rw-r--r-- | usr.bin/patch/pch.c | 6 | ||||
-rw-r--r-- | usr.bin/patch/util.c | 4 | ||||
-rw-r--r-- | usr.bin/patch/util.h | 4 |
6 files changed, 23 insertions, 23 deletions
diff --git a/usr.bin/grep/grep.c b/usr.bin/grep/grep.c index aa10b0a2cb4..8ce5a0cb96d 100644 --- a/usr.bin/grep/grep.c +++ b/usr.bin/grep/grep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grep.c,v 1.28 2004/05/07 14:51:42 millert Exp $ */ +/* $OpenBSD: grep.c,v 1.29 2004/08/05 21:47:33 deraadt Exp $ */ /*- * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav @@ -449,7 +449,7 @@ main(int argc, char *argv[]) } } } - + if (lbflag) setlinebuf(stdout); diff --git a/usr.bin/patch/backupfile.c b/usr.bin/patch/backupfile.c index 5863e9b1b14..856d2a6f948 100644 --- a/usr.bin/patch/backupfile.c +++ b/usr.bin/patch/backupfile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: backupfile.c,v 1.17 2003/08/01 20:30:48 otto Exp $ */ +/* $OpenBSD: backupfile.c,v 1.18 2004/08/05 21:47:24 deraadt Exp $ */ /* * backupfile.c -- make Emacs style backup file names Copyright (C) 1990 Free @@ -17,7 +17,7 @@ */ #ifndef lint -static const char rcsid[] = "$OpenBSD: backupfile.c,v 1.17 2003/08/01 20:30:48 otto Exp $"; +static const char rcsid[] = "$OpenBSD: backupfile.c,v 1.18 2004/08/05 21:47:24 deraadt Exp $"; #endif /* not lint */ #include <ctype.h> @@ -40,14 +40,14 @@ enum backup_type backup_type = none; * The extension added to file names to produce a simple (as opposed to * numbered) backup file name. */ -char *simple_backup_suffix = "~"; - -static char *concat(const char *, const char *); -static char *make_version_name(const char *, int); -static int max_backup_version(const char *, const char *); -static int version_number(const char *, const char *, int); -static int argmatch(const char *, const char **); -static void invalid_arg(const char *, const char *, int); +char *simple_backup_suffix = "~"; + +static char *concat(const char *, const char *); +static char *make_version_name(const char *, int); +static int max_backup_version(const char *, const char *); +static int version_number(const char *, const char *, int); +static int argmatch(const char *, const char **); +static void invalid_arg(const char *, const char *, int); /* * Return the name of the new backup file for file FILE, allocated with diff --git a/usr.bin/patch/inp.c b/usr.bin/patch/inp.c index 3326843ad00..b77cf530f6c 100644 --- a/usr.bin/patch/inp.c +++ b/usr.bin/patch/inp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inp.c,v 1.31 2003/12/08 22:44:18 mickey Exp $ */ +/* $OpenBSD: inp.c,v 1.32 2004/08/05 21:47:24 deraadt Exp $ */ /* * patch - a program to apply diffs to original files @@ -27,7 +27,7 @@ */ #ifndef lint -static const char rcsid[] = "$OpenBSD: inp.c,v 1.31 2003/12/08 22:44:18 mickey Exp $"; +static const char rcsid[] = "$OpenBSD: inp.c,v 1.32 2004/08/05 21:47:24 deraadt Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -265,7 +265,7 @@ plan_a(const char *filename) if (lines_allocated < 100) lines_allocated = 100; - if (!reallocate_lines(&lines_allocated)) + if (!reallocate_lines(&lines_allocated)) return false; /* now scan the buffer and build pointer array */ @@ -358,7 +358,7 @@ plan_b(const char *filename) last_line_missing_eol = i > 0 && buf[i - 1] != '\n'; if (last_line_missing_eol && maxlen == i) maxlen++; - + if (revision != NULL) { if (!found_revision) { if (force) { diff --git a/usr.bin/patch/pch.c b/usr.bin/patch/pch.c index bfdb1763010..8edf5d94553 100644 --- a/usr.bin/patch/pch.c +++ b/usr.bin/patch/pch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pch.c,v 1.34 2004/07/09 19:13:46 otto Exp $ */ +/* $OpenBSD: pch.c,v 1.35 2004/08/05 21:47:24 deraadt Exp $ */ /* * patch - a program to apply diffs to original files @@ -27,7 +27,7 @@ */ #ifndef lint -static const char rcsid[] = "$OpenBSD: pch.c,v 1.34 2004/07/09 19:13:46 otto Exp $"; +static const char rcsid[] = "$OpenBSD: pch.c,v 1.35 2004/08/05 21:47:24 deraadt Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -143,7 +143,7 @@ static void grow_hunkmax(void) { int new_hunkmax; - char **new_p_line; + char **new_p_line; short *new_p_len; char *new_p_char; diff --git a/usr.bin/patch/util.c b/usr.bin/patch/util.c index 23a22b17078..871b3b958dc 100644 --- a/usr.bin/patch/util.c +++ b/usr.bin/patch/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.27 2003/10/31 20:20:45 millert Exp $ */ +/* $OpenBSD: util.c,v 1.28 2004/08/05 21:47:24 deraadt Exp $ */ /* * patch - a program to apply diffs to original files @@ -27,7 +27,7 @@ */ #ifndef lint -static const char rcsid[] = "$OpenBSD: util.c,v 1.27 2003/10/31 20:20:45 millert Exp $"; +static const char rcsid[] = "$OpenBSD: util.c,v 1.28 2004/08/05 21:47:24 deraadt Exp $"; #endif /* not lint */ #include <sys/param.h> diff --git a/usr.bin/patch/util.h b/usr.bin/patch/util.h index 0ec187028b9..bffa571fcb1 100644 --- a/usr.bin/patch/util.h +++ b/usr.bin/patch/util.h @@ -1,4 +1,4 @@ -/* $OpenBSD: util.h,v 1.12 2003/10/31 20:20:45 millert Exp $ */ +/* $OpenBSD: util.h,v 1.13 2004/08/05 21:47:24 deraadt Exp $ */ /* * patch - a program to apply diffs to original files @@ -44,4 +44,4 @@ void set_signals(int); void ignore_signals(void); void makedirs(const char *, bool); void version(void); -void my_exit(int) __attribute__((noreturn)); +void my_exit(int) __attribute__((noreturn)); |