diff options
| -rw-r--r-- | usr.bin/sort/coll.c | 8 | ||||
| -rw-r--r-- | usr.bin/sort/file.c | 4 | ||||
| -rw-r--r-- | usr.bin/sort/file.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/sort/coll.c b/usr.bin/sort/coll.c index 3f6b68a1f79..4735d3ebaff 100644 --- a/usr.bin/sort/coll.c +++ b/usr.bin/sort/coll.c @@ -1,4 +1,4 @@ -/* $OpenBSD: coll.c,v 1.7 2015/04/02 20:58:43 tobias Exp $ */ +/* $OpenBSD: coll.c,v 1.8 2015/04/02 22:14:51 deraadt Exp $ */ /*- * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org> @@ -76,7 +76,7 @@ keys_array_alloc(void) } /* - * Calculate whether we need key hint space + * Calculate whether we need key hint space */ static size_t key_hint_size(void) @@ -582,8 +582,8 @@ list_coll(const void *ss1, const void *ss2) (struct sort_list_item **)ss2, 0); } -#define LSCDEF(N) \ -static int \ +#define LSCDEF(N) \ +static int \ list_coll_##N(struct sort_list_item **ss1, struct sort_list_item **ss2) \ { \ \ diff --git a/usr.bin/sort/file.c b/usr.bin/sort/file.c index 79e4018ce12..1ae477e81ac 100644 --- a/usr.bin/sort/file.c +++ b/usr.bin/sort/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.18 2015/04/02 21:04:06 tobias Exp $ */ +/* $OpenBSD: file.c,v 1.19 2015/04/02 22:14:51 deraadt Exp $ */ /*- * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org> @@ -970,7 +970,7 @@ file_headers_merge(size_t fnum, struct file_header **fh, FILE *f_out) memset(&lp, 0, sizeof(lp)); /* - * construct the initial sort structure + * construct the initial sort structure */ for (i = 0; i < fnum; i++) file_header_list_push(fh[i], fh, i); diff --git a/usr.bin/sort/file.h b/usr.bin/sort/file.h index 8a8eab784e1..b6350d2c292 100644 --- a/usr.bin/sort/file.h +++ b/usr.bin/sort/file.h @@ -1,4 +1,4 @@ -/* $OpenBSD: file.h,v 1.3 2015/04/02 21:04:06 tobias Exp $ */ +/* $OpenBSD: file.h,v 1.4 2015/04/02 22:14:51 deraadt Exp $ */ /*- * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org> @@ -54,7 +54,7 @@ struct sort_list { }; /* - * File reader object + * File reader object */ struct file_reader; |