aboutsummaryrefslogtreecommitdiff
path: root/lib/libedit/chared.c
diff options
context:
space:
mode:
authorRodney W. Grimes <rgrimes@FreeBSD.org>1995-05-30 05:51:47 +0000
committerRodney W. Grimes <rgrimes@FreeBSD.org>1995-05-30 05:51:47 +0000
commit6c06b4e2aa2a28d1f0bbd29ecdce35aaaf600ce8 (patch)
treee1331adb5d216f2b3fa6baa6491752348d2e5f10 /lib/libedit/chared.c
parenta2f0036ac41fe46dd47d6339982567f19437ade9 (diff)
downloadsrc-6c06b4e2aa2a28d1f0bbd29ecdce35aaaf600ce8.tar.gz
src-6c06b4e2aa2a28d1f0bbd29ecdce35aaaf600ce8.zip
Remove trailing whitespace.
Notes
Notes: svn path=/head/; revision=8870
Diffstat (limited to 'lib/libedit/chared.c')
-rw-r--r--lib/libedit/chared.c68
1 files changed, 34 insertions, 34 deletions
diff --git a/lib/libedit/chared.c b/lib/libedit/chared.c
index 5a393a762484..62e2f6a22219 100644
--- a/lib/libedit/chared.c
+++ b/lib/libedit/chared.c
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)chared.c 8.1 (Berkeley) 6/4/93";
#endif /* not lint && not SCCSID */
-/*
+/*
* chared.c: Character editor utilities
*/
#include "sys.h"
@@ -67,7 +67,7 @@ cv_undo(el, action, size, ptr)
}
-/* c_insert():
+/* c_insert():
* Insert num characters
*/
protected void
@@ -80,7 +80,7 @@ c_insert(el, num)
if (el->el_line.lastchar + num >= el->el_line.limit)
return; /* can't go past end of buffer */
- if (el->el_line.cursor < el->el_line.lastchar) {
+ if (el->el_line.cursor < el->el_line.lastchar) {
/* if I must move chars */
for (cp = el->el_line.lastchar; cp >= el->el_line.cursor; cp--)
cp[num] = *cp;
@@ -93,7 +93,7 @@ c_insert(el, num)
* Delete num characters after the cursor
*/
protected void
-c_delafter(el, num)
+c_delafter(el, num)
EditLine *el;
int num;
{
@@ -101,10 +101,10 @@ c_delafter(el, num)
if (el->el_line.cursor + num > el->el_line.lastchar)
num = el->el_line.lastchar - el->el_line.cursor;
- if (num > 0) {
+ if (num > 0) {
char *cp;
- if (el->el_map.current != el->el_map.emacs)
+ if (el->el_map.current != el->el_map.emacs)
cv_undo(el, INSERT, num, el->el_line.cursor);
for (cp = el->el_line.cursor; cp <= el->el_line.lastchar; cp++)
@@ -125,12 +125,12 @@ c_delbefore(el, num)
{
if (el->el_line.cursor - num < el->el_line.buffer)
- num = el->el_line.cursor - el->el_line.buffer;
+ num = el->el_line.cursor - el->el_line.buffer;
- if (num > 0) {
+ if (num > 0) {
char *cp;
- if (el->el_map.current != el->el_map.emacs)
+ if (el->el_map.current != el->el_map.emacs)
cv_undo(el, INSERT, num, el->el_line.cursor - num);
for (cp = el->el_line.cursor - num; cp <= el->el_line.lastchar; cp++)
@@ -145,7 +145,7 @@ c_delbefore(el, num)
* Return if p is part of a word according to emacs
*/
protected int
-ce__isword(p)
+ce__isword(p)
int p;
{
return isalpha(p) || isdigit(p) || strchr("*?_-.[]~=", p) != NULL;
@@ -156,7 +156,7 @@ ce__isword(p)
* Return if p is part of a word according to vi
*/
protected int
-cv__isword(p)
+cv__isword(p)
int p;
{
return !isspace(p);
@@ -167,7 +167,7 @@ cv__isword(p)
* Find the previous word
*/
protected char *
-c__prev_word(p, low, n, wtest)
+c__prev_word(p, low, n, wtest)
register char *p, *low;
register int n;
int (*wtest) __P((int));
@@ -175,9 +175,9 @@ c__prev_word(p, low, n, wtest)
p--;
while (n--) {
- while ((p >= low) && !(*wtest)((unsigned char) *p))
+ while ((p >= low) && !(*wtest)((unsigned char) *p))
p--;
- while ((p >= low) && (*wtest)((unsigned char) *p))
+ while ((p >= low) && (*wtest)((unsigned char) *p))
p--;
}
@@ -200,9 +200,9 @@ c__next_word(p, high, n, wtest)
int (*wtest) __P((int));
{
while (n--) {
- while ((p < high) && !(*wtest)((unsigned char) *p))
+ while ((p < high) && !(*wtest)((unsigned char) *p))
p++;
- while ((p < high) && (*wtest)((unsigned char) *p))
+ while ((p < high) && (*wtest)((unsigned char) *p))
p++;
}
if (p > high)
@@ -225,14 +225,14 @@ cv_next_word(el, p, high, n, wtest)
while (n--) {
test = (*wtest)((unsigned char) *p);
- while ((p < high) && (*wtest)((unsigned char) *p) == test)
+ while ((p < high) && (*wtest)((unsigned char) *p) == test)
p++;
/*
* vi historically deletes with cw only the word preserving the
* trailing whitespace! This is not what 'w' does..
*/
- if (el->el_chared.c_vcmd.action != (DELETE|INSERT))
- while ((p < high) && isspace((unsigned char) *p))
+ if (el->el_chared.c_vcmd.action != (DELETE|INSERT))
+ while ((p < high) && isspace((unsigned char) *p))
p++;
}
@@ -262,14 +262,14 @@ cv_prev_word(el, p, low, n, wtest)
* vi historically deletes with cb only the word preserving the
* leading whitespace! This is not what 'b' does..
*/
- if (el->el_chared.c_vcmd.action != (DELETE|INSERT))
- while ((p > low) && isspace((unsigned char) *p))
+ if (el->el_chared.c_vcmd.action != (DELETE|INSERT))
+ while ((p > low) && isspace((unsigned char) *p))
p--;
test = (*wtest)((unsigned char) *p);
- while ((p >= low) && (*wtest)((unsigned char) *p) == test)
+ while ((p >= low) && (*wtest)((unsigned char) *p) == test)
p--;
p++;
- while (isspace((unsigned char) *p))
+ while (isspace((unsigned char) *p))
p++;
}
@@ -319,7 +319,7 @@ c__number(p, num, dval)
* Finish vi delete action
*/
protected void
-cv_delfini(el)
+cv_delfini(el)
EditLine *el;
{
register int size;
@@ -331,13 +331,13 @@ cv_delfini(el)
oaction = el->el_chared.c_vcmd.action;
el->el_chared.c_vcmd.action = NOP;
- if (el->el_chared.c_vcmd.pos == 0)
+ if (el->el_chared.c_vcmd.pos == 0)
return;
if (el->el_line.cursor > el->el_chared.c_vcmd.pos) {
size = (int) (el->el_line.cursor - el->el_chared.c_vcmd.pos);
- c_delbefore(el, size);
+ c_delbefore(el, size);
el->el_line.cursor = el->el_chared.c_vcmd.pos;
re_refresh_cursor(el);
}
@@ -362,7 +362,7 @@ cv_delfini(el)
abort();
break;
}
-
+
el->el_chared.c_undo.ptr = el->el_line.cursor;
el->el_chared.c_undo.dsize = size;
@@ -383,7 +383,7 @@ ce__endword(p, high, n)
while (n--) {
while ((p < high) && isspace((unsigned char) *p))
p++;
- while ((p < high) && !isspace((unsigned char) *p))
+ while ((p < high) && !isspace((unsigned char) *p))
p++;
}
@@ -404,14 +404,14 @@ cv__endword(p, high, n)
p++;
while (n--) {
- while ((p < high) && isspace((unsigned char) *p))
+ while ((p < high) && isspace((unsigned char) *p))
p++;
if (isalnum((unsigned char) *p))
- while ((p < high) && isalnum((unsigned char) *p))
+ while ((p < high) && isalnum((unsigned char) *p))
p++;
else
- while ((p < high) && !(isspace((unsigned char) *p) ||
+ while ((p < high) && !(isspace((unsigned char) *p) ||
isalnum((unsigned char) *p)))
p++;
}
@@ -458,7 +458,7 @@ ch_init(el)
el->el_chared.c_macro.nline = NULL;
el->el_chared.c_macro.level = -1;
- el->el_chared.c_macro.macro = (char **) el_malloc(EL_MAXMACRO *
+ el->el_chared.c_macro.macro = (char **) el_malloc(EL_MAXMACRO *
sizeof(char *));
return 0;
}
@@ -551,7 +551,7 @@ el_deletestr(el, n)
if (n <= 0)
return;
- if (el->el_line.cursor < &el->el_line.buffer[n])
+ if (el->el_line.cursor < &el->el_line.buffer[n])
return;
c_delbefore(el, n); /* delete before dot */
@@ -630,7 +630,7 @@ c_hpos(el)
if (el->el_line.cursor == el->el_line.buffer)
return 0;
else {
- for (ptr = el->el_line.cursor - 1;
+ for (ptr = el->el_line.cursor - 1;
ptr >= el->el_line.buffer && *ptr != '\n';
ptr--)
continue;