diff options
| author |   millert <millert@openbsd.org> | 2015-04-01 21:46:38 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2015-04-01 21:46:38 +0000 |
| commit | 5bf6c2a65528befefa057782d6a181e120cbd208 (patch) | |
| tree | 99d6314131ce87a68e753e2e1208bd72678b8276 | |
| parent | Remove some unneeded NULL checks that don't really help anything. (diff) | |
| download | wireguard-openbsd-5bf6c2a65528befefa057782d6a181e120cbd208.tar.xz wireguard-openbsd-5bf6c2a65528befefa057782d6a181e120cbd208.zip | |
Style nits, remove whitespace at the start of a function.
| -rw-r--r-- | usr.bin/sort/coll.c | 4 | ||||
| -rw-r--r-- | usr.bin/sort/vsort.c | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/usr.bin/sort/coll.c b/usr.bin/sort/coll.c index 7138291d07c..083fede53de 100644 --- a/usr.bin/sort/coll.c +++ b/usr.bin/sort/coll.c @@ -1,4 +1,4 @@ -/* $OpenBSD: coll.c,v 1.4 2015/04/01 20:58:13 millert Exp $ */ +/* $OpenBSD: coll.c,v 1.5 2015/04/01 21:46:38 millert Exp $ */ /*- * Copyright (C) 2009 Gabor Kovesdan <gabor@FreeBSD.org> @@ -406,11 +406,13 @@ preproc(struct bwstring *s, struct keys_array *ka) struct bwstring *ret = NULL; struct sort_mods *sm = default_sort_mods; +#if 0 /* historically -b has only been effective w/ -k */ if (sm->bflag) { if (ret == NULL) ret = bwsdup(s); ret = ignore_leading_blanks(ret); } +#endif if (sm->dflag) { if (ret == NULL) ret = bwsdup(s); diff --git a/usr.bin/sort/vsort.c b/usr.bin/sort/vsort.c index 3c7276a9599..c2882bee34a 100644 --- a/usr.bin/sort/vsort.c +++ b/usr.bin/sort/vsort.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vsort.c,v 1.1 2015/03/17 17:45:13 millert Exp $ */ +/* $OpenBSD: vsort.c,v 1.2 2015/04/01 21:46:38 millert Exp $ */ /*- * Copyright (C) 2012 Oleg Moskalenko <mom040267@gmail.com> @@ -39,21 +39,18 @@ static inline bool isdigit_clocale(wchar_t c) { - return (c >= L'0' && c <= L'9'); } static inline bool isalpha_clocale(wchar_t c) { - return ((c >= L'a' && c <= L'z') || (c >= L'A' && c <= L'Z')); } static inline bool isalnum_clocale(wchar_t c) { - return ((c >= L'a' && c <= L'z') || (c >= L'A' && c <= L'Z') || (c >= L'0' && c <= L'9')); } @@ -114,7 +111,6 @@ find_suffix(bwstring_iterator si, bwstring_iterator se, size_t *len) static inline int cmp_chars(wchar_t c1, wchar_t c2) { - if (c1 == c2) return 0; |