Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/lib/libedit whitespace and header sorting changes (Ingo Schw...
details: https://anonhg.NetBSD.org/src/rev/4b0137d9fdb3
branches: trunk
changeset: 343628:4b0137d9fdb3
user: christos <christos%NetBSD.org@localhost>
date: Wed Feb 17 19:47:49 2016 +0000
description:
whitespace and header sorting changes (Ingo Schwarze). No functional changes.
diffstat:
lib/libedit/Makefile | 8 ++++----
lib/libedit/TEST/tc1.c | 16 ++++++++--------
lib/libedit/TEST/wtc1.c | 14 +++++++-------
lib/libedit/chared.c | 8 ++++----
lib/libedit/chartype.c | 6 +++---
lib/libedit/chartype.h | 12 ++++++------
lib/libedit/common.c | 23 +++++++++++------------
lib/libedit/el.c | 12 ++++++------
lib/libedit/el.h | 6 +++---
lib/libedit/filecomplete.c | 24 ++++++++++++------------
lib/libedit/hist.h | 4 ++--
lib/libedit/histedit.h | 6 +++---
lib/libedit/history.c | 12 ++++++------
lib/libedit/keymacro.c | 16 ++++++++--------
lib/libedit/makelist | 4 ++--
lib/libedit/map.c | 16 ++++++++--------
lib/libedit/parse.c | 8 ++++----
lib/libedit/prompt.h | 4 ++--
lib/libedit/read.c | 8 ++++----
lib/libedit/read.h | 4 ++--
lib/libedit/readline.c | 32 ++++++++++++++++----------------
lib/libedit/readline/Makefile | 2 +-
lib/libedit/readline/readline.h | 12 ++++++------
lib/libedit/refresh.c | 16 ++++++++--------
lib/libedit/sys.h | 6 +++---
lib/libedit/terminal.c | 21 ++++++++++-----------
lib/libedit/tokenizer.c | 7 ++++---
lib/libedit/tty.c | 10 +++++-----
lib/libedit/vi.c | 8 ++++----
29 files changed, 162 insertions(+), 163 deletions(-)
diffs (truncated from 1217 to 300 lines):
diff -r 6b7f0f04e46e -r 4b0137d9fdb3 lib/libedit/Makefile
--- a/lib/libedit/Makefile Wed Feb 17 19:44:40 2016 +0000
+++ b/lib/libedit/Makefile Wed Feb 17 19:47:49 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2015/01/29 20:30:02 joerg Exp $
+# $NetBSD: Makefile,v 1.54 2016/02/17 19:47:49 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 6/4/93
USE_SHLIBDIR= yes
@@ -52,12 +52,12 @@
CLEANFILES+=common.h.tmp editline.c.tmp emacs.h.tmp fcns.c.tmp fcns.h.tmp
CLEANFILES+=help.c.tmp help.h.tmp vi.h.tmp tc1.o tc1
CLEANFILES+=tokenizern.c.tmp tokenizern.c tokenizerw.c.tmp tokenizerw.c
-CPPFLAGS+=-I. -I${LIBEDITDIR}
+CPPFLAGS+=-I. -I${LIBEDITDIR}
CPPFLAGS+=-I. -I${.CURDIR}
CPPFLAGS+=#-DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG -DDEBUG_REFRESH
CPPFLAGS+=#-DDEBUG_PASTE -DDEBUG_EDIT
-AHDR=vi.h emacs.h common.h
+AHDR=vi.h emacs.h common.h
ASRC=${LIBEDITDIR}/vi.c ${LIBEDITDIR}/emacs.c ${LIBEDITDIR}/common.c
DPSRCS+= ${AHDR} fcns.h help.h fcns.c help.c
@@ -120,7 +120,7 @@
tc1.o: ${LIBEDITDIR}/TEST/tc1.c
-tc1: libedit.a tc1.o
+tc1: libedit.a tc1.o
${_MKTARGET_LINK}
${CC} ${LDFLAGS} ${.ALLSRC} -o ${.TARGET} libedit.a ${LDADD} -ltermlib
diff -r 6b7f0f04e46e -r 4b0137d9fdb3 lib/libedit/TEST/tc1.c
--- a/lib/libedit/TEST/tc1.c Wed Feb 17 19:44:40 2016 +0000
+++ b/lib/libedit/TEST/tc1.c Wed Feb 17 19:47:49 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tc1.c,v 1.6 2014/06/18 20:12:15 christos Exp $ */
+/* $NetBSD: tc1.c,v 1.7 2016/02/17 19:47:49 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -42,22 +42,22 @@
#if 0
static char sccsid[] = "@(#)test.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: tc1.c,v 1.6 2014/06/18 20:12:15 christos Exp $");
+__RCSID("$NetBSD: tc1.c,v 1.7 2016/02/17 19:47:49 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
/*
* test.c: A little test program
*/
-#include <stdio.h>
-#include <string.h>
-#include <signal.h>
#include <sys/wait.h>
#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
#include <dirent.h>
#include <locale.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
#include "histedit.h"
@@ -157,7 +157,7 @@
/* Add a user-defined function */
el_set(el, EL_ADDFN, "ed-complete", "Complete argument", complete);
- /* Bind tab to it */
+ /* Bind tab to it */
el_set(el, EL_BIND, "^I", "ed-complete", NULL);
/*
diff -r 6b7f0f04e46e -r 4b0137d9fdb3 lib/libedit/TEST/wtc1.c
--- a/lib/libedit/TEST/wtc1.c Wed Feb 17 19:44:40 2016 +0000
+++ b/lib/libedit/TEST/wtc1.c Wed Feb 17 19:47:49 2016 +0000
@@ -1,14 +1,14 @@
-#include <stdio.h>
-#include <string.h>
-#include <signal.h>
#include <sys/wait.h>
+#include <ctype.h>
+#include <dirent.h>
#include <err.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <dirent.h>
#include <limits.h>
#include <locale.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
#include "../histedit.h"
diff -r 6b7f0f04e46e -r 4b0137d9fdb3 lib/libedit/chared.c
--- a/lib/libedit/chared.c Wed Feb 17 19:44:40 2016 +0000
+++ b/lib/libedit/chared.c Wed Feb 17 19:47:49 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: chared.c,v 1.46 2016/02/16 22:53:14 christos Exp $ */
+/* $NetBSD: chared.c,v 1.47 2016/02/17 19:47:49 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)chared.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: chared.c,v 1.46 2016/02/16 22:53:14 christos Exp $");
+__RCSID("$NetBSD: chared.c,v 1.47 2016/02/17 19:47:49 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -526,7 +526,7 @@
/* zero the newly added memory, leave old data in */
(void) memset(&newbuffer[sz], 0, (newsz - sz) * sizeof(*newbuffer));
-
+
oldbuf = el->el_line.buffer;
el->el_line.buffer = newbuffer;
@@ -575,7 +575,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;
diff -r 6b7f0f04e46e -r 4b0137d9fdb3 lib/libedit/chartype.c
--- a/lib/libedit/chartype.c Wed Feb 17 19:44:40 2016 +0000
+++ b/lib/libedit/chartype.c Wed Feb 17 19:47:49 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: chartype.c,v 1.18 2016/02/16 22:53:14 christos Exp $ */
+/* $NetBSD: chartype.c,v 1.19 2016/02/17 19:47:49 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include "config.h"
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: chartype.c,v 1.18 2016/02/16 22:53:14 christos Exp $");
+__RCSID("$NetBSD: chartype.c,v 1.19 2016/02/17 19:47:49 christos Exp $");
#endif /* not lint && not SCCSID */
#include <ctype.h>
@@ -76,7 +76,7 @@
{
void *p;
- if (wsize <= conv->wsize)
+ if (wsize <= conv->wsize)
return 0;
conv->wsize = wsize;
diff -r 6b7f0f04e46e -r 4b0137d9fdb3 lib/libedit/chartype.h
--- a/lib/libedit/chartype.h Wed Feb 17 19:44:40 2016 +0000
+++ b/lib/libedit/chartype.h Wed Feb 17 19:47:49 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: chartype.h,v 1.20 2016/02/14 17:06:24 christos Exp $ */
+/* $NetBSD: chartype.h,v 1.21 2016/02/17 19:47:49 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
#define FUNW(type) type ## _w
#define TYPE(type) type ## W
#define FSTR "%ls"
-#define STR(x) L ## x
+#define STR(x) L ## x
#define UC(c) c
#define Isalpha(x) iswalpha(x)
#define Isalnum(x) iswalnum(x)
@@ -113,10 +113,10 @@
#else /* NARROW */
-size_t ct_mbrtowc(char *, const char *, size_t, void *);
+size_t ct_mbrtowc(char *, const char *, size_t, void *);
#define ct_wctob(w) ((int)(w))
#define ct_wctomb error
-#define ct_wctomb_reset
+#define ct_wctomb_reset
#define ct_wcstombs(a, b, c) (strncpy(a, b, c), strlen(a))
#define ct_mbstowcs(a, b, c) (strncpy(a, b, c), strlen(a))
@@ -125,7 +125,7 @@
#define FUNW(type) type
#define TYPE(type) type
#define FSTR "%s"
-#define STR(x) x
+#define STR(x) x
#define UC(c) (unsigned char)(c)
#define Isalpha(x) isalpha((unsigned char)x)
@@ -214,7 +214,7 @@
#define VISUAL_WIDTH_MAX ((size_t)8)
/* The terminal is thought of in terms of X columns by Y lines. In the cases
- * where a wide character takes up more than one column, the adjacent
+ * where a wide character takes up more than one column, the adjacent
* occupied column entries will contain this faux character. */
#define MB_FILL_CHAR ((Char)-1)
diff -r 6b7f0f04e46e -r 4b0137d9fdb3 lib/libedit/common.c
--- a/lib/libedit/common.c Wed Feb 17 19:44:40 2016 +0000
+++ b/lib/libedit/common.c Wed Feb 17 19:47:49 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: common.c,v 1.37 2016/02/16 22:53:14 christos Exp $ */
+/* $NetBSD: common.c,v 1.38 2016/02/17 19:47:49 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)common.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: common.c,v 1.37 2016/02/16 22:53:14 christos Exp $");
+__RCSID("$NetBSD: common.c,v 1.38 2016/02/17 19:47:49 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -453,7 +453,7 @@
*/
protected el_action_t
/*ARGSUSED*/
-ed_tty_sigint(EditLine *el __attribute__((__unused__)),
+ed_tty_sigint(EditLine *el __attribute__((__unused__)),
wint_t c __attribute__((__unused__)))
{
@@ -467,7 +467,7 @@
*/
protected el_action_t
/*ARGSUSED*/
-ed_tty_dsusp(EditLine *el __attribute__((__unused__)),
+ed_tty_dsusp(EditLine *el __attribute__((__unused__)),
wint_t c __attribute__((__unused__)))
{
@@ -481,7 +481,7 @@
*/
protected el_action_t
/*ARGSUSED*/
-ed_tty_flush_output(EditLine *el __attribute__((__unused__)),
+ed_tty_flush_output(EditLine *el __attribute__((__unused__)),
wint_t c __attribute__((__unused__)))
{
@@ -495,7 +495,7 @@
*/
protected el_action_t
/*ARGSUSED*/
-ed_tty_sigquit(EditLine *el __attribute__((__unused__)),
+ed_tty_sigquit(EditLine *el __attribute__((__unused__)),
wint_t c __attribute__((__unused__)))
{
@@ -509,7 +509,7 @@
*/
protected el_action_t
/*ARGSUSED*/
-ed_tty_sigtstp(EditLine *el __attribute__((__unused__)),
+ed_tty_sigtstp(EditLine *el __attribute__((__unused__)),
wint_t c __attribute__((__unused__)))
{
@@ -523,7 +523,7 @@
*/
protected el_action_t
/*ARGSUSED*/
-ed_tty_stop_output(EditLine *el __attribute__((__unused__)),
+ed_tty_stop_output(EditLine *el __attribute__((__unused__)),
wint_t c __attribute__((__unused__)))
{
@@ -537,7 +537,7 @@
*/
protected el_action_t
/*ARGSUSED*/
-ed_tty_start_output(EditLine *el __attribute__((__unused__)),
+ed_tty_start_output(EditLine *el __attribute__((__unused__)),
wint_t c __attribute__((__unused__)))
{
@@ -602,7 +602,7 @@
*/
Home |
Main Index |
Thread Index |
Old Index