diff options
author | rgrimes <rgrimes@FreeBSD.org> | 1995-05-30 06:41:30 +0000 |
---|---|---|
committer | rgrimes <rgrimes@FreeBSD.org> | 1995-05-30 06:41:30 +0000 |
commit | a14d555c873398b14776ca4f2c33f9c69617afb9 (patch) | |
tree | 350f6f98843363254f9afe467ae0c92d5a9d7f43 /usr.bin/more | |
parent | f3a2b348daf9fa6063c38d2d69563f732a2f80e7 (diff) | |
download | FreeBSD-src-a14d555c873398b14776ca4f2c33f9c69617afb9.zip FreeBSD-src-a14d555c873398b14776ca4f2c33f9c69617afb9.tar.gz |
Remove trailing whitespace.
Diffstat (limited to 'usr.bin/more')
-rw-r--r-- | usr.bin/more/ch.c | 2 | ||||
-rw-r--r-- | usr.bin/more/command.c | 6 | ||||
-rw-r--r-- | usr.bin/more/input.c | 4 | ||||
-rw-r--r-- | usr.bin/more/line.c | 26 | ||||
-rw-r--r-- | usr.bin/more/linenum.c | 6 | ||||
-rw-r--r-- | usr.bin/more/output.c | 2 | ||||
-rw-r--r-- | usr.bin/more/position.c | 2 | ||||
-rw-r--r-- | usr.bin/more/prim.c | 26 | ||||
-rw-r--r-- | usr.bin/more/screen.c | 22 | ||||
-rw-r--r-- | usr.bin/more/tags.c | 6 |
10 files changed, 51 insertions, 51 deletions
diff --git a/usr.bin/more/ch.c b/usr.bin/more/ch.c index ab12946..52e80d0 100644 --- a/usr.bin/more/ch.c +++ b/usr.bin/more/ch.c @@ -428,7 +428,7 @@ ch_addbuf(nnew) char *calloc(); /* - * We don't have enough buffers. + * We don't have enough buffers. * Allocate some new ones. */ newbufs = (struct buf *)calloc((u_int)nnew, sizeof(struct buf)); diff --git a/usr.bin/more/command.c b/usr.bin/more/command.c index cf86e60..1585245 100644 --- a/usr.bin/more/command.c +++ b/usr.bin/more/command.c @@ -487,7 +487,7 @@ again: if (sigs) * to 0 and get a new character for the start * of the pattern. */ - start_mca(action, + start_mca(action, (action == A_F_SEARCH) ? "!/" : "!?"); wsearch = 0; c = getcc(); @@ -497,10 +497,10 @@ again: if (sigs) if (number <= 0) number = 1; if (wsearch) - start_mca(last_mca, + start_mca(last_mca, (last_mca == A_F_SEARCH) ? "/" : "?"); else - start_mca(last_mca, + start_mca(last_mca, (last_mca == A_F_SEARCH) ? "!/" : "!?"); CMD_EXEC; (void)search(mca == A_F_SEARCH, (char *)NULL, diff --git a/usr.bin/more/input.c b/usr.bin/more/input.c index 521bc53..bdf65bb 100644 --- a/usr.bin/more/input.c +++ b/usr.bin/more/input.c @@ -37,7 +37,7 @@ static char sccsid[] = "@(#)input.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ /* - * High level routines dealing with getting lines of input + * High level routines dealing with getting lines of input * from the file being viewed. * * When we speak of "lines" here, we mean PRINTABLE lines; @@ -204,7 +204,7 @@ back_line(curr_pos) * until we reach the curr_pos. * * {{ This algorithm is pretty inefficient if the lines - * are much longer than the screen width, + * are much longer than the screen width, * but I don't know of any better way. }} */ if (ch_seek(new_pos)) diff --git a/usr.bin/more/line.c b/usr.bin/more/line.c index 5d07f55..0f2b6c6 100644 --- a/usr.bin/more/line.c +++ b/usr.bin/more/line.c @@ -67,9 +67,9 @@ static int column; /* Printable length, accounting for * else to end boldface mode. * LN_UL_X means we are one character after LN_UNDERLINE * (we have gotten the '_' in "_\bX" or the 'X' in "X\b_"). - * LN_UL_XB means we are one character after LN_UL_X + * LN_UL_XB means we are one character after LN_UL_X * (we have gotten the backspace in "_\bX" or "X\b_"; - * we expect one more ordinary character, + * we expect one more ordinary character, * which will put us back in state LN_UNDERLINE). * LN_BO_X means we are one character after LN_BOLDFACE * (we have gotten the 'X' in "X\bX"). @@ -155,7 +155,7 @@ pappend(c) * Almost out of room in the line buffer. * Don't take any chances. * {{ Linebuf is supposed to be big enough that this - * will never happen, but may need to be made + * will never happen, but may need to be made * bigger for wide screens or lots of backspaces. }} */ return(1); @@ -184,7 +184,7 @@ enter_boldface: column--; if (column + bo_width + be_width >= sc_width) /* - * Not enough room left on the screen to + * Not enough room left on the screen to * enter and exit boldface mode. */ return (1); @@ -193,7 +193,7 @@ enter_boldface: && curr[-3] == ' ') { /* * Special case for magic cookie terminals: - * if the previous char was a space, replace + * if the previous char was a space, replace * it with the "enter boldface" sequence. */ curr[-3] = BO_CHAR; @@ -214,17 +214,17 @@ enter_underline: column--; if (column + ul_width + ue_width >= sc_width) /* - * Not enough room left on the screen to + * Not enough room left on the screen to * enter and exit underline mode. */ return (1); - if (ul_width > 0 && + if (ul_width > 0 && curr > linebuf + 2 && curr[-3] == ' ') { /* * Special case for magic cookie terminals: - * if the previous char was a space, replace + * if the previous char was a space, replace * it with the "enter underline" sequence. */ curr[-3] = UL_CHAR; @@ -287,7 +287,7 @@ ln_bo_xb_case: case LN_UNDERLINE: if (column + ue_width + bo_width + be_width >= sc_width) /* - * We have just barely enough room to + * We have just barely enough room to * exit underline mode and handle a possible * underline/boldface run on mixup. */ @@ -302,7 +302,7 @@ ln_bo_xb_case: } if (column + be_width + ul_width + ue_width >= sc_width) /* - * We have just barely enough room to + * We have just barely enough room to * exit underline mode and handle a possible * underline/boldface run on mixup. */ @@ -333,7 +333,7 @@ ln_bo_xb_case: else curr++; ln_state = LN_NORMAL; - } + } break; case LN_BO_X: if (c == '\b') @@ -359,7 +359,7 @@ ln_bo_xb_case: else curr++; ln_state = LN_NORMAL; - } + } break; } } @@ -382,7 +382,7 @@ ln_bo_xb_case: column--; *curr++ = c; return(0); - } + } switch ((char)c) { case UL_CHAR: diff --git a/usr.bin/more/linenum.c b/usr.bin/more/linenum.c index 4bfefa8..dd3d82d 100644 --- a/usr.bin/more/linenum.c +++ b/usr.bin/more/linenum.c @@ -242,7 +242,7 @@ longloopmessage() ierror("Calculating line numbers"); /* * Set the lnloop flag here, so if the user interrupts while - * we are calculating line numbers, the signal handler will + * we are calculating line numbers, the signal handler will * turn off line numbers (linenums=0). */ lnloop = 1; @@ -292,9 +292,9 @@ find_linenum(pos) * reading the file forward or backward till we * get to the place we want. * - * First decide whether we should go forward from the + * First decide whether we should go forward from the * previous one or backwards from the next one. - * The decision is based on which way involves + * The decision is based on which way involves * traversing fewer bytes in the file. */ flush(); diff --git a/usr.bin/more/output.c b/usr.bin/more/output.c index 38142db..a02e4d8 100644 --- a/usr.bin/more/output.c +++ b/usr.bin/more/output.c @@ -231,7 +231,7 @@ error(s) } lower_left(); - if ((s==NULL)?0:(strlen(s)) + sizeof(return_to_continue) + + if ((s==NULL)?0:(strlen(s)) + sizeof(return_to_continue) + so_width + se_width + 1 > sc_width) /* * Printing the message has probably scrolled the screen. diff --git a/usr.bin/more/position.c b/usr.bin/more/position.c index 8564be0..57ffb32 100644 --- a/usr.bin/more/position.c +++ b/usr.bin/more/position.c @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)position.c 8.1 (Berkeley) 6/6/93"; * first char on each currently displayed line. * * {{ The position table is scrolled by moving all the entries. - * Would be better to have a circular table + * Would be better to have a circular table * and just change a couple of pointers. }} */ diff --git a/usr.bin/more/prim.c b/usr.bin/more/prim.c index be09d2e..adb17d1 100644 --- a/usr.bin/more/prim.c +++ b/usr.bin/more/prim.c @@ -115,7 +115,7 @@ forw(n, pos, only_last) squish_check(); /* - * do_repaint tells us not to display anything till the end, + * do_repaint tells us not to display anything till the end, * then just repaint the entire screen. */ do_repaint = (only_last && n > sc_height-1); @@ -290,7 +290,7 @@ backward(n, only_last) * never empty. */ if (pos == NULL_POSITION) - return; + return; back(n, pos, only_last); } @@ -356,9 +356,9 @@ jump_back(n) * nearest known line rather than at the beginning. }} */ if (ch_seek((off_t)0)) { - /* - * Probably a pipe with beginning of file no longer buffered. - * If he wants to go to line 1, we do the best we can, + /* + * Probably a pipe with beginning of file no longer buffered. + * If he wants to go to line 1, we do the best we can, * by going to the first line which is still buffered. */ if (n <= 1 && ch_beg_seek() == 0) @@ -429,7 +429,7 @@ jump_loc(pos) if ((nline = onscreen(pos)) >= 0) { /* - * The line is currently displayed. + * The line is currently displayed. * Just scroll there. */ forw(nline, position(BOTTOM_PLUS_ONE), 0); @@ -579,7 +579,7 @@ get_back_scroll() } /* - * Search for the n-th occurence of a specified pattern, + * Search for the n-th occurence of a specified pattern, * either forward or backward. */ search(search_forward, pattern, n, wantmatch) @@ -603,9 +603,9 @@ search(search_forward, pattern, n, wantmatch) regfree(&rx); } - regerr = regcomp(&rx, pattern, (REG_EXTENDED | REG_NOSUB + regerr = regcomp(&rx, pattern, (REG_EXTENDED | REG_NOSUB | (caseless ? REG_ICASE : 0))); - + if (regerr) { regerror(regerr, &rx, errbuf, sizeof errbuf); error(errbuf); @@ -618,7 +618,7 @@ search(search_forward, pattern, n, wantmatch) error("No previous regular expression"); return 0; } - + /* * Figure out where to start the search. */ @@ -656,8 +656,8 @@ search(search_forward, pattern, n, wantmatch) for (;;) { /* - * Get lines until we find a matching one or - * until we hit end-of-file (or beginning-of-file + * Get lines until we find a matching one or + * until we hit end-of-file (or beginning-of-file * if we're going backwards). */ if (sigs) @@ -669,7 +669,7 @@ search(search_forward, pattern, n, wantmatch) if (search_forward) { /* - * Read the next line, and save the + * Read the next line, and save the * starting position of that line in linepos. */ linepos = pos; diff --git a/usr.bin/more/screen.c b/usr.bin/more/screen.c index 2dc99ec..7fd6a45 100644 --- a/usr.bin/more/screen.c +++ b/usr.bin/more/screen.c @@ -125,9 +125,9 @@ char *tgoto(); /* * Change terminal to "raw mode", or restore to "normal" mode. - * "Raw mode" means + * "Raw mode" means * 1. An outstanding read will complete on receipt of a single keystroke. - * 2. Input is not echoed. + * 2. Input is not echoed. * 3. On output, \n is mapped to \r\n. * 4. \t is NOT expanded into spaces. * 5. Signal-causing characters such as ctrl-C (interrupt), @@ -340,7 +340,7 @@ get_term() if (hard || sc_move == NULL || *sc_move == '\0') { /* - * This is not an error here, because we don't + * This is not an error here, because we don't * always need sc_move. * We need it only if we don't have home or lower-left. */ @@ -382,7 +382,7 @@ get_term() { /* * This last resort for sc_home is supposed to - * be an up-arrow suggesting moving to the + * be an up-arrow suggesting moving to the * top of the "virtual screen". (The one in * your imagination as you try to use this on * a hard copy terminal.) @@ -390,7 +390,7 @@ get_term() sc_home = "|\b^"; } else { - /* + /* * No "home" string, * but we can use "move(0,0)". */ @@ -409,7 +409,7 @@ get_term() } else { /* - * No "lower-left" string, + * No "lower-left" string, * but we can use "move(0,last-line)". */ (void)strcpy(sp, tgoto(sc_move, 0, sc_height-1)); @@ -422,7 +422,7 @@ get_term() * To add a line at top of screen and scroll the display down, * we use "al" (add line) or "sr" (scroll reverse). */ - if ((sc_addline = tgetstr("al", &sp)) == NULL || + if ((sc_addline = tgetstr("al", &sp)) == NULL || *sc_addline == '\0') sc_addline = tgetstr("sr", &sp); @@ -445,7 +445,7 @@ get_term() /* - * Below are the functions which perform all the + * Below are the functions which perform all the * terminal-specific screen manipulation. */ @@ -551,7 +551,7 @@ so_exit() } /* - * Begin "underline" (hopefully real underlining, + * Begin "underline" (hopefully real underlining, * otherwise whatever the terminal provides). */ ul_enter() @@ -588,12 +588,12 @@ bo_exit() } /* - * Erase the character to the left of the cursor + * Erase the character to the left of the cursor * and move the cursor left. */ backspace() { - /* + /* * Try to erase the previous character by overstriking with a space. */ tputs(sc_backspace, 1, putchr); diff --git a/usr.bin/more/tags.c b/usr.bin/more/tags.c index 029557e..0d805fa 100644 --- a/usr.bin/more/tags.c +++ b/usr.bin/more/tags.c @@ -147,7 +147,7 @@ findtag(tag) * We don't use search() for several reasons: * - We don't want to blow away any search string we may have saved. * - The various regular-expression functions (from different systems: - * regcmp vs. re_comp) behave differently in the presence of + * regcmp vs. re_comp) behave differently in the presence of * parentheses (which are almost always found in a tag). */ tagsearch() @@ -161,14 +161,14 @@ tagsearch() for (;;) { /* - * Get lines until we find a matching one or + * Get lines until we find a matching one or * until we hit end-of-file. */ if (sigs) return (1); /* - * Read the next line, and save the + * Read the next line, and save the * starting position of that line in linepos. */ linepos = pos; |