summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2017-01-21 10:03:28 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2017-01-21 10:03:28 +0000
commit5634107b10bf8ca90cd3cc18b060c3841912adc7 (patch)
tree8c13c4a90c71187d10efacc4b804e8b846533144 /usr.bin
parent0de0f851acbf4fb39c4a14d6967e228b65d348a0 (diff)
Nuke more whitespace caught in the headlights of "warning:"
rectification.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/look/look.c64
1 files changed, 32 insertions, 32 deletions
diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c
index 2f6fd63c0c2..a6112639e3f 100644
--- a/usr.bin/look/look.c
+++ b/usr.bin/look/look.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: look.c,v 1.20 2017/01/21 08:51:00 krw Exp $ */
+/* $OpenBSD: look.c,v 1.21 2017/01/21 10:03:27 krw Exp $ */
/* $NetBSD: look.c,v 1.7 1995/08/31 22:41:02 jtc Exp $ */
/*-
@@ -35,7 +35,7 @@
/*
* look -- find lines in a sorted list.
- *
+ *
* The man page said that TABs and SPACEs participate in -d comparisons.
* In fact, they were ignored. This implements historic practice, not
* the manual page.
@@ -153,40 +153,40 @@ look(char *string, char *front, char *back)
/*
* Binary search for "string" in memory between "front" and "back".
- *
+ *
* This routine is expected to return a pointer to the start of a line at
* *or before* the first word matching "string". Relaxing the constraint
* this way simplifies the algorithm.
- *
+ *
* Invariants:
- * front points to the beginning of a line at or before the first
+ * front points to the beginning of a line at or before the first
* matching string.
- *
- * back points to the beginning of a line at or after the first
+ *
+ * back points to the beginning of a line at or after the first
* matching line.
- *
+ *
* Base of the Invariants.
- * front = NULL;
+ * front = NULL;
* back = EOF;
- *
+ *
* Advancing the Invariants:
- *
- * p = first newline after halfway point from front to back.
- *
- * If the string at "p" is not greater than the string to match,
+ *
+ * p = first newline after halfway point from front to back.
+ *
+ * If the string at "p" is not greater than the string to match,
* p is the new front. Otherwise it is the new back.
- *
+ *
* Termination:
- *
- * The definition of the routine allows it return at any point,
+ *
+ * The definition of the routine allows it return at any point,
* since front is always at or before the line to print.
- *
- * In fact, it returns when the chosen "p" equals "back". This
- * implies that there exists a string is least half as long as
- * (back - front), which in turn implies that a linear search will
+ *
+ * In fact, it returns when the chosen "p" equals "back". This
+ * implies that there exists a string is least half as long as
+ * (back - front), which in turn implies that a linear search will
* be no more expensive than the cost of simply printing a string or two.
- *
- * Trying to continue with binary search at this point would be
+ *
+ * Trying to continue with binary search at this point would be
* more trouble than it's worth.
*/
#define SKIP_PAST_NEWLINE(p, back) \
@@ -218,12 +218,12 @@ binary_search(char *string, char *front, char *back)
/*
* Find the first line that starts with string, linearly searching from front
* to back.
- *
+ *
* Return NULL for no such line.
- *
+ *
* This routine assumes:
- *
- * o front points at the first character in a line.
+ *
+ * o front points at the first character in a line.
* o front is before or at the first line to be printed.
*/
char *
@@ -248,7 +248,7 @@ linear_search(char *string, char *front, char *back)
/*
* Print as many lines as match string, starting at front.
*/
-void
+void
print_from(char *string, char *front, char *back)
{
for (; front < back && compare(string, front, back) == EQUAL; ++front) {
@@ -263,13 +263,13 @@ print_from(char *string, char *front, char *back)
/*
* Return LESS, GREATER, or EQUAL depending on how the string1 compares with
* string2 (s1 ??? s2).
- *
- * o Matches up to len(s1) are EQUAL.
+ *
+ * o Matches up to len(s1) are EQUAL.
* o Matches up to len(s2) are GREATER.
- *
+ *
* Compare understands about the -f and -d flags, and treats comparisons
* appropriately.
- *
+ *
* The string "s1" is null terminated. The string s2 is '\n' terminated (or
* "back" terminated).
*/