[thirdparty-commits] seanbright: editline/trunk r169 - in /editline/trunk: ./ np/
SVN commits to the Digium third-party software repository
thirdparty-commits at lists.digium.com
Fri May 7 12:51:39 CDT 2010
Author: seanbright
Date: Fri May 7 12:51:35 2010
New Revision: 169
URL: http://svnview.digium.com/svn/thirdparty?view=rev&rev=169
Log:
Remove all trailing whitespace. Take THAT.
Modified:
editline/trunk/CHANGES
editline/trunk/INSTALL
editline/trunk/chared.c
editline/trunk/common.c
editline/trunk/config.guess
editline/trunk/configure.in
editline/trunk/editrc.5
editline/trunk/filecomplete.c
editline/trunk/history.c
editline/trunk/install-sh
editline/trunk/key.c
editline/trunk/map.c
editline/trunk/np/unvis.c
editline/trunk/np/vis.c
editline/trunk/read.h
editline/trunk/readline.c
editline/trunk/refresh.c
editline/trunk/sys.h
editline/trunk/term.c
editline/trunk/vi.c
Modified: editline/trunk/CHANGES
URL: http://svnview.digium.com/svn/thirdparty/editline/trunk/CHANGES?view=diff&rev=169&r1=168&r2=169
==============================================================================
--- editline/trunk/CHANGES (original)
+++ editline/trunk/CHANGES Fri May 7 12:51:35 2010
@@ -146,7 +146,7 @@
* fix readline emulation history parsing
* fix incremental search
* add the ability to set a termios character from setty
-
+
2003-03-10 : Christos Zoulas <christos at netbsd.org>
* Fix order of weak_extern
* Don't hard-code the path for awk
Modified: editline/trunk/INSTALL
URL: http://svnview.digium.com/svn/thirdparty/editline/trunk/INSTALL?view=diff&rev=169&r1=168&r2=169
==============================================================================
--- editline/trunk/INSTALL (original)
+++ editline/trunk/INSTALL Fri May 7 12:51:35 2010
@@ -29,7 +29,7 @@
--prefix=<install-root-dir>
Set the base directory in which to install. For example:
-
+
./configure --prefix=/usr/local
will cause files to be installed into /usr/local/bin, /usr/local/man,
@@ -51,7 +51,7 @@
CPPFLAGS="?"
Pass these flags to the C preprocessor. Note that CFLAGS is not passed
- to 'cpp' when 'configure' is looking for include files, so you must use
+ to 'cpp' when 'configure' is looking for include files, so you must use
CPPFLAGS instead if you need to help 'configure' find header files.
LD_LIBRARY_PATH="?"
Modified: editline/trunk/chared.c
URL: http://svnview.digium.com/svn/thirdparty/editline/trunk/chared.c?view=diff&rev=169&r1=168&r2=169
==============================================================================
--- editline/trunk/chared.c (original)
+++ editline/trunk/chared.c Fri May 7 12:51:35 2010
@@ -570,7 +570,7 @@
/* zero the newly added memory, leave old data in */
(void) memset(&newbuffer[sz], 0, newsz - sz);
-
+
oldbuf = el->el_line.buffer;
el->el_line.buffer = newbuffer;
@@ -616,7 +616,7 @@
el->el_chared.c_redo.lim = newbuffer +
(el->el_chared.c_redo.lim - el->el_chared.c_redo.buf);
el->el_chared.c_redo.buf = newbuffer;
-
+
if (!hist_enlargebuf(el, sz, newsz))
return 0;
Modified: editline/trunk/common.c
URL: http://svnview.digium.com/svn/thirdparty/editline/trunk/common.c?view=diff&rev=169&r1=168&r2=169
==============================================================================
--- editline/trunk/common.c (original)
+++ editline/trunk/common.c Fri May 7 12:51:35 2010
@@ -449,7 +449,7 @@
*/
protected el_action_t
/*ARGSUSED*/
-ed_tty_sigint(EditLine *el __attribute__((__unused__)),
+ed_tty_sigint(EditLine *el __attribute__((__unused__)),
int c __attribute__((__unused__)))
{
@@ -463,7 +463,7 @@
*/
protected el_action_t
/*ARGSUSED*/
-ed_tty_dsusp(EditLine *el __attribute__((__unused__)),
+ed_tty_dsusp(EditLine *el __attribute__((__unused__)),
int c __attribute__((__unused__)))
{
@@ -477,7 +477,7 @@
*/
protected el_action_t
/*ARGSUSED*/
-ed_tty_flush_output(EditLine *el __attribute__((__unused__)),
+ed_tty_flush_output(EditLine *el __attribute__((__unused__)),
int c __attribute__((__unused__)))
{
@@ -491,7 +491,7 @@
*/
protected el_action_t
/*ARGSUSED*/
-ed_tty_sigquit(EditLine *el __attribute__((__unused__)),
+ed_tty_sigquit(EditLine *el __attribute__((__unused__)),
int c __attribute__((__unused__)))
{
@@ -505,7 +505,7 @@
*/
protected el_action_t
/*ARGSUSED*/
-ed_tty_sigtstp(EditLine *el __attribute__((__unused__)),
+ed_tty_sigtstp(EditLine *el __attribute__((__unused__)),
int c __attribute__((__unused__)))
{
@@ -519,7 +519,7 @@
*/
protected el_action_t
/*ARGSUSED*/
-ed_tty_stop_output(EditLine *el __attribute__((__unused__)),
+ed_tty_stop_output(EditLine *el __attribute__((__unused__)),
int c __attribute__((__unused__)))
{
@@ -533,7 +533,7 @@
*/
protected el_action_t
/*ARGSUSED*/
-ed_tty_start_output(EditLine *el __attribute__((__unused__)),
+ed_tty_start_output(EditLine *el __attribute__((__unused__)),
int c __attribute__((__unused__)))
{
@@ -598,7 +598,7 @@
*/
protected el_action_t
/*ARGSUSED*/
-ed_redisplay(EditLine *el __attribute__((__unused__)),
+ed_redisplay(EditLine *el __attribute__((__unused__)),
int c __attribute__((__unused__)))
{
@@ -626,7 +626,7 @@
*/
protected el_action_t
/*ARGSUSED*/
-ed_sequence_lead_in(EditLine *el __attribute__((__unused__)),
+ed_sequence_lead_in(EditLine *el __attribute__((__unused__)),
int c __attribute__((__unused__)))
{
Modified: editline/trunk/config.guess
URL: http://svnview.digium.com/svn/thirdparty/editline/trunk/config.guess?view=diff&rev=169&r1=168&r2=169
==============================================================================
--- editline/trunk/config.guess (original)
+++ editline/trunk/config.guess Fri May 7 12:51:35 2010
@@ -832,7 +832,7 @@
;;
a.out-i386-linux)
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit 0 ;;
+ exit 0 ;;
coff-i386)
echo "${UNAME_MACHINE}-pc-linux-gnucoff"
exit 0 ;;
Modified: editline/trunk/configure.in
URL: http://svnview.digium.com/svn/thirdparty/editline/trunk/configure.in?view=diff&rev=169&r1=168&r2=169
==============================================================================
--- editline/trunk/configure.in (original)
+++ editline/trunk/configure.in Fri May 7 12:51:35 2010
@@ -1,6 +1,6 @@
-dnl
+dnl
dnl Process this file with autoconf to produce a configure script.
-dnl
+dnl
AC_INIT(Makefile.in)
dnl If CFLAGS isn't defined and using gcc, set CFLAGS to something reasonable.
@@ -135,10 +135,10 @@
CFLAGS="$CFLAGS -O"
fi
-dnl
+dnl
dnl File lists. This is done here instead of in the Makefile in order to avoid
dnl the need for conditionals.
-dnl
+dnl
dnl .c files.
ACSRCS="common.c emacs.c vi.c"
Modified: editline/trunk/editrc.5
URL: http://svnview.digium.com/svn/thirdparty/editline/trunk/editrc.5?view=diff&rev=169&r1=168&r2=169
==============================================================================
--- editline/trunk/editrc.5 (original)
+++ editline/trunk/editrc.5 Fri May 7 12:51:35 2010
@@ -227,7 +227,7 @@
.Nm editline
functionality in a program.
.It Ic history Ar list | Ar size Dv n | Ar unique Dv n
-The
+The
.Ar list
command lists all entries in the history.
The
Modified: editline/trunk/filecomplete.c
URL: http://svnview.digium.com/svn/thirdparty/editline/trunk/filecomplete.c?view=diff&rev=169&r1=168&r2=169
==============================================================================
--- editline/trunk/filecomplete.c (original)
+++ editline/trunk/filecomplete.c Fri May 7 12:51:35 2010
@@ -438,7 +438,7 @@
(int)(cur_off - len), cur_off);
} else
matches = 0;
- if (!attempted_completion_function ||
+ if (!attempted_completion_function ||
(over != NULL && !*over && !matches))
matches = completion_matches(temp, complet_func);
@@ -468,7 +468,7 @@
* it, unless we do filename completion and the
* object is a directory.
*/
- el_insertstr(el, (*append_char_function)(matches[0]));
+ el_insertstr(el, (*append_char_function)(matches[0]));
} else if (what_to_do == '!') {
display_matches:
/*
@@ -482,7 +482,7 @@
maxlen = match_len;
}
matches_num = i - 1;
-
+
/* newline to get on next line from command line */
(void)fprintf(el->el_outfile, "\n");
Modified: editline/trunk/history.c
URL: http://svnview.digium.com/svn/thirdparty/editline/trunk/history.c?view=diff&rev=169&r1=168&r2=169
==============================================================================
--- editline/trunk/history.c (original)
+++ editline/trunk/history.c Fri May 7 12:51:35 2010
@@ -391,7 +391,7 @@
*/
/* ARGSUSED */
private void
-history_def_delete(history_t *h,
+history_def_delete(history_t *h,
HistEvent *ev __attribute__((__unused__)), hentry_t *hp)
{
HistEventPrivate *evp = (void *)&hp->ev;
@@ -446,7 +446,7 @@
if ((h->flags & H_UNIQUE) != 0 && h->list.next != &h->list &&
strcmp(h->list.next->ev.str, str) == 0)
- return (0);
+ return (0);
if (history_def_insert(h, ev, str) == -1)
return (-1); /* error, keep error message */
Modified: editline/trunk/install-sh
URL: http://svnview.digium.com/svn/thirdparty/editline/trunk/install-sh?view=diff&rev=169&r1=168&r2=169
==============================================================================
--- editline/trunk/install-sh (original)
+++ editline/trunk/install-sh Fri May 7 12:51:35 2010
@@ -115,7 +115,7 @@
if [ x"$dir_arg" != x ]; then
dst=$src
src=""
-
+
if [ -d $dst ]; then
instcmd=:
else
@@ -124,7 +124,7 @@
else
# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad
+# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
if [ -f $src -o -d $src ]
@@ -134,7 +134,7 @@
echo "install: $src does not exist"
exit 1
fi
-
+
if [ x"$dst" = x ]
then
echo "install: no destination specified"
@@ -162,7 +162,7 @@
# Skip lots of stat calls in the usual case.
if [ ! -d "$dstdir" ]; then
-defaultIFS='
+defaultIFS='
'
IFS="${IFS-${defaultIFS}}"
@@ -201,17 +201,17 @@
# If we're going to rename the final executable, determine the name now.
- if [ x"$transformarg" = x ]
+ if [ x"$transformarg" = x ]
then
dstfile=`basename $dst`
else
- dstfile=`basename $dst $transformbasename |
+ dstfile=`basename $dst $transformbasename |
sed $transformarg`$transformbasename
fi
# don't allow the sed command to completely eliminate the filename
- if [ x"$dstfile" = x ]
+ if [ x"$dstfile" = x ]
then
dstfile=`basename $dst`
else
@@ -242,7 +242,7 @@
# Now rename the file to the real destination.
$doit $rmcmd -f $dstdir/$dstfile &&
- $doit $mvcmd $dsttmp $dstdir/$dstfile
+ $doit $mvcmd $dsttmp $dstdir/$dstfile
fi &&
Modified: editline/trunk/key.c
URL: http://svnview.digium.com/svn/thirdparty/editline/trunk/key.c?view=diff&rev=169&r1=168&r2=169
==============================================================================
--- editline/trunk/key.c (original)
+++ editline/trunk/key.c Fri May 7 12:51:35 2010
@@ -583,7 +583,7 @@
case XK_STR:
case XK_EXE:
(void) key__decode_str(val->str, unparsbuf,
- sizeof(unparsbuf),
+ sizeof(unparsbuf),
ntype == XK_STR ? "\"\"" : "[]");
(void) fprintf(el->el_outfile, fmt, key, unparsbuf);
break;
Modified: editline/trunk/map.c
URL: http://svnview.digium.com/svn/thirdparty/editline/trunk/map.c?view=diff&rev=169&r1=168&r2=169
==============================================================================
--- editline/trunk/map.c (original)
+++ editline/trunk/map.c Fri May 7 12:51:35 2010
@@ -1157,7 +1157,7 @@
lastbuf[1] = 0;
if (map[first] == ED_UNASSIGNED) {
if (first == last) {
- (void) key__decode_str(firstbuf, unparsbuf,
+ (void) key__decode_str(firstbuf, unparsbuf,
sizeof(unparsbuf), STRQQ);
(void) fprintf(el->el_outfile,
"%-15s-> is undefined\n", unparsbuf);
@@ -1168,14 +1168,14 @@
for (bp = el->el_map.help; bp < ep; bp++) {
if (bp->func == map[first]) {
if (first == last) {
- (void) key__decode_str(firstbuf, unparsbuf,
+ (void) key__decode_str(firstbuf, unparsbuf,
sizeof(unparsbuf), STRQQ);
(void) fprintf(el->el_outfile, "%-15s-> %s\n",
unparsbuf, bp->name);
} else {
- (void) key__decode_str(firstbuf, unparsbuf,
+ (void) key__decode_str(firstbuf, unparsbuf,
sizeof(unparsbuf), STRQQ);
- (void) key__decode_str(lastbuf, extrabuf,
+ (void) key__decode_str(lastbuf, extrabuf,
sizeof(extrabuf), STRQQ);
(void) fprintf(el->el_outfile,
"%-4s to %-7s-> %s\n",
@@ -1186,14 +1186,14 @@
}
#ifdef MAP_DEBUG
if (map == el->el_map.key) {
- (void) key__decode_str(firstbuf, unparsbuf,
+ (void) key__decode_str(firstbuf, unparsbuf,
sizeof(unparsbuf), STRQQ);
(void) fprintf(el->el_outfile,
"BUG!!! %s isn't bound to anything.\n", unparsbuf);
(void) fprintf(el->el_outfile, "el->el_map.key[%d] == %d\n",
first, el->el_map.key[first]);
} else {
- (void) key__decode_str(firstbuf, unparsbuf,
+ (void) key__decode_str(firstbuf, unparsbuf,
sizeof(unparsbuf), STRQQ);
(void) fprintf(el->el_outfile,
"BUG!!! %s isn't bound to anything.\n", unparsbuf);
Modified: editline/trunk/np/unvis.c
URL: http://svnview.digium.com/svn/thirdparty/editline/trunk/np/unvis.c?view=diff&rev=169&r1=168&r2=169
==============================================================================
--- editline/trunk/np/unvis.c (original)
+++ editline/trunk/np/unvis.c Fri May 7 12:51:35 2010
@@ -108,7 +108,7 @@
|| *astate == S_HEX2) {
*astate = S_GROUND;
return (UNVIS_VALID);
- }
+ }
return (*astate == S_GROUND ? UNVIS_NOCHAR : UNVIS_SYNBAD);
}
@@ -119,7 +119,7 @@
if (c == '\\') {
*astate = S_START;
return (0);
- }
+ }
if ((flag & VIS_HTTPSTYLE) && c == '%') {
*astate = S_HEX1;
return (0);
@@ -196,7 +196,7 @@
}
*astate = S_GROUND;
return (UNVIS_SYNBAD);
-
+
case S_META:
if (c == '-')
*astate = S_META1;
@@ -207,12 +207,12 @@
return (UNVIS_SYNBAD);
}
return (0);
-
+
case S_META1:
*astate = S_GROUND;
*cp |= c;
return (UNVIS_VALID);
-
+
case S_CTRL:
if (c == '?')
*cp |= 0177;
@@ -223,15 +223,15 @@
case S_OCTAL2: /* second possible octal digit */
if (isoctal(c)) {
- /*
- * yes - and maybe a third
+ /*
+ * yes - and maybe a third
*/
*cp = (*cp << 3) + (c - '0');
- *astate = S_OCTAL3;
- return (0);
- }
- /*
- * no - done with current sequence, push back passed char
+ *astate = S_OCTAL3;
+ return (0);
+ }
+ /*
+ * no - done with current sequence, push back passed char
*/
*astate = S_GROUND;
return (UNVIS_VALIDPUSH);
@@ -252,8 +252,8 @@
*astate = S_HEX2;
return (0);
}
- /*
- * no - done with current sequence, push back passed char
+ /*
+ * no - done with current sequence, push back passed char
*/
*astate = S_GROUND;
return (UNVIS_VALIDPUSH);
@@ -264,9 +264,9 @@
return (UNVIS_VALID);
}
return (UNVIS_VALIDPUSH);
- default:
- /*
- * decoder in unknown state - (probably uninitialized)
+ default:
+ /*
+ * decoder in unknown state - (probably uninitialized)
*/
*astate = S_GROUND;
return (UNVIS_SYNBAD);
@@ -274,7 +274,7 @@
}
/*
- * strunvis - decode src into dst
+ * strunvis - decode src into dst
*
* Number of chars decoded into dst is returned, -1 on error.
* Dst is null terminated.
Modified: editline/trunk/np/vis.c
URL: http://svnview.digium.com/svn/thirdparty/editline/trunk/np/vis.c?view=diff&rev=169&r1=168&r2=169
==============================================================================
--- editline/trunk/np/vis.c (original)
+++ editline/trunk/np/vis.c Fri May 7 12:51:35 2010
@@ -112,7 +112,7 @@
SVIS(dst, c, flag, nextc, extra); \
} \
while (/*CONSTCOND*/0)
-
+
/*
* This is SVIS, the central macro of vis.
* dst: Pointer to the destination buffer
@@ -220,10 +220,10 @@
* be encoded, too. These functions are useful e. g. to
* encode strings in such a way so that they are not interpreted
* by a shell.
- *
+ *
* Dst must be 4 times the size of src to account for possible
* expansion. The length of dst, not including the trailing NULL,
- * is returned.
+ * is returned.
*
* Strsvisx encodes exactly len bytes from src into dst.
* This is useful for encoding a block of data.
@@ -295,7 +295,7 @@
vis(dst, c, flag, nextc)
char *dst;
int c, flag, nextc;
-
+
{
char *extra;
@@ -313,10 +313,10 @@
/*
* strvis, strvisx - visually encode characters from src into dst
- *
+ *
* Dst must be 4 times the size of src to account for possible
* expansion. The length of dst, not including the trailing NULL,
- * is returned.
+ * is returned.
*
* Strvisx encodes exactly len bytes from src into dst.
* This is useful for encoding a block of data.
Modified: editline/trunk/read.h
URL: http://svnview.digium.com/svn/thirdparty/editline/trunk/read.h?view=diff&rev=169&r1=168&r2=169
==============================================================================
--- editline/trunk/read.h (original)
+++ editline/trunk/read.h Fri May 7 12:51:35 2010
@@ -43,7 +43,7 @@
typedef struct el_read_t {
el_rfunc_t read_char; /* Function to read a character */
} el_read_t;
-
+
protected int read_init(EditLine *);
protected void read_prepare(EditLine *);
protected void read_finish(EditLine *);
Modified: editline/trunk/readline.c
URL: http://svnview.digium.com/svn/thirdparty/editline/trunk/readline.c?view=diff&rev=169&r1=168&r2=169
==============================================================================
--- editline/trunk/readline.c (original)
+++ editline/trunk/readline.c Fri May 7 12:51:35 2010
@@ -303,7 +303,7 @@
"ReadLine compatible suspend function",
_el_rl_tstp);
el_set(e, EL_BIND, "^Z", "rl_tstp", NULL);
-
+
/* read settings from configuration file */
el_source(e, NULL);
@@ -1638,7 +1638,7 @@
}
}
-void
+void
rl_callback_handler_install (const char *prompt, VCPFunction *linefunc)
{
if (e == NULL) {
@@ -1649,9 +1649,9 @@
rl_prompt = prompt ? strdup(strchr(prompt, *prompt)) : NULL;
rl_linefunc = linefunc;
el_set(e, EL_UNBUFFERED, 1);
-}
-
-void
+}
+
+void
rl_callback_handler_remove(void)
{
el_set(e, EL_UNBUFFERED, 0);
Modified: editline/trunk/refresh.c
URL: http://svnview.digium.com/svn/thirdparty/editline/trunk/refresh.c?view=diff&rev=169&r1=168&r2=169
==============================================================================
--- editline/trunk/refresh.c (original)
+++ editline/trunk/refresh.c Fri May 7 12:51:35 2010
@@ -163,7 +163,7 @@
for(i=1; i < lins; i++)
el->el_vdisplay[i-1] = el->el_vdisplay[i];
- firstline[0] = '\0'; /* empty the string */
+ firstline[0] = '\0'; /* empty the string */
el->el_vdisplay[i-1] = firstline;
} else
el->el_refresh.r_cursor.v++;
@@ -1037,7 +1037,7 @@
if (el->el_cursor.v + 1 >= el->el_term.t_size.v) {
int i, lins = el->el_term.t_size.v;
char *firstline = el->el_display[0];
-
+
for(i=1; i < lins; i++)
el->el_display[i-1] = el->el_display[i];
Modified: editline/trunk/sys.h
URL: http://svnview.digium.com/svn/thirdparty/editline/trunk/sys.h?view=diff&rev=169&r1=168&r2=169
==============================================================================
--- editline/trunk/sys.h (original)
+++ editline/trunk/sys.h Fri May 7 12:51:35 2010
@@ -57,7 +57,7 @@
# define __END_DECLS
# endif
#endif
-
+
#ifndef public
# define public /* Externally visible functions/variables */
#endif
Modified: editline/trunk/term.c
URL: http://svnview.digium.com/svn/thirdparty/editline/trunk/term.c?view=diff&rev=169&r1=168&r2=169
==============================================================================
--- editline/trunk/term.c (original)
+++ editline/trunk/term.c Fri May 7 12:51:35 2010
@@ -628,7 +628,7 @@
(el->el_cursor.h & 0370);
i < (where & 0370);
i += 8)
- term__putc('\t');
+ term__putc('\t');
/* then tab over */
el->el_cursor.h = where & 0370;
}
@@ -1278,7 +1278,7 @@
*/
protected int
/*ARGSUSED*/
-term_telltc(EditLine *el, int argc __attribute__((__unused__)),
+term_telltc(EditLine *el, int argc __attribute__((__unused__)),
const char **argv __attribute__((__unused__)))
{
const struct termcapstr *t;
Modified: editline/trunk/vi.c
URL: http://svnview.digium.com/svn/thirdparty/editline/trunk/vi.c?view=diff&rev=169&r1=168&r2=169
==============================================================================
--- editline/trunk/vi.c (original)
+++ editline/trunk/vi.c Fri May 7 12:51:35 2010
@@ -976,7 +976,7 @@
el->el_history.eventno = 1;
if (hist_get(el) == CC_ERROR)
return CC_ERROR;
- el->el_history.eventno = 1 + el->el_history.ev.num
+ el->el_history.eventno = 1 + el->el_history.ev.num
- el->el_state.argument;
if (el->el_history.eventno < 0) {
el->el_history.eventno = sv_event_no;
More information about the thirdparty-commits
mailing list