Module Name: src
Committed By: christos
Date: Mon May 9 21:46:56 UTC 2016
Modified Files:
src/lib/libedit: chared.c chared.h chartype.c chartype.h common.c el.c
el.h emacs.c hist.c hist.h keymacro.c keymacro.h makelist map.c
map.h parse.c parse.h prompt.c prompt.h read.c read.h refresh.c
refresh.h search.c search.h sig.c sig.h sys.h terminal.c terminal.h
tty.c tty.h vi.c
Log Message:
s/protected/libedit_private/g
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/lib/libedit/chared.c
cvs rdiff -u -r1.28 -r1.29 src/lib/libedit/chared.h src/lib/libedit/hist.c \
src/lib/libedit/makelist
cvs rdiff -u -r1.29 -r1.30 src/lib/libedit/chartype.c
cvs rdiff -u -r1.33 -r1.34 src/lib/libedit/chartype.h
cvs rdiff -u -r1.45 -r1.46 src/lib/libedit/common.c
cvs rdiff -u -r1.90 -r1.91 src/lib/libedit/el.c
cvs rdiff -u -r1.39 -r1.40 src/lib/libedit/el.h src/lib/libedit/parse.c
cvs rdiff -u -r1.35 -r1.36 src/lib/libedit/emacs.c
cvs rdiff -u -r1.21 -r1.22 src/lib/libedit/hist.h src/lib/libedit/keymacro.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libedit/keymacro.h
cvs rdiff -u -r1.50 -r1.51 src/lib/libedit/map.c src/lib/libedit/refresh.c
cvs rdiff -u -r1.12 -r1.13 src/lib/libedit/map.h
cvs rdiff -u -r1.8 -r1.9 src/lib/libedit/parse.h src/lib/libedit/terminal.h
cvs rdiff -u -r1.25 -r1.26 src/lib/libedit/prompt.c src/lib/libedit/sig.c
cvs rdiff -u -r1.14 -r1.15 src/lib/libedit/prompt.h
cvs rdiff -u -r1.95 -r1.96 src/lib/libedit/read.c
cvs rdiff -u -r1.10 -r1.11 src/lib/libedit/read.h src/lib/libedit/sig.h
cvs rdiff -u -r1.9 -r1.10 src/lib/libedit/refresh.h
cvs rdiff -u -r1.46 -r1.47 src/lib/libedit/search.c
cvs rdiff -u -r1.13 -r1.14 src/lib/libedit/search.h
cvs rdiff -u -r1.26 -r1.27 src/lib/libedit/sys.h
cvs rdiff -u -r1.31 -r1.32 src/lib/libedit/terminal.c
cvs rdiff -u -r1.64 -r1.65 src/lib/libedit/tty.c
cvs rdiff -u -r1.20 -r1.21 src/lib/libedit/tty.h
cvs rdiff -u -r1.61 -r1.62 src/lib/libedit/vi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/chared.c
diff -u src/lib/libedit/chared.c:1.54 src/lib/libedit/chared.c:1.55
--- src/lib/libedit/chared.c:1.54 Mon Apr 18 13:01:19 2016
+++ src/lib/libedit/chared.c Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: chared.c,v 1.54 2016/04/18 17:01:19 christos Exp $ */
+/* $NetBSD: chared.c,v 1.55 2016/05/09 21:46:56 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.54 2016/04/18 17:01:19 christos Exp $");
+__RCSID("$NetBSD: chared.c,v 1.55 2016/05/09 21:46:56 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -60,7 +60,7 @@ static void ch__clearmacro (EditLine *);
/* cv_undo():
* Handle state for the vi undo command
*/
-protected void
+libedit_private void
cv_undo(EditLine *el)
{
c_undo_t *vu = &el->el_chared.c_undo;
@@ -84,7 +84,7 @@ cv_undo(EditLine *el)
/* cv_yank():
* Save yank/delete data for paste
*/
-protected void
+libedit_private void
cv_yank(EditLine *el, const wchar_t *ptr, int size)
{
c_kill_t *k = &el->el_chared.c_kill;
@@ -97,7 +97,7 @@ cv_yank(EditLine *el, const wchar_t *ptr
/* c_insert():
* Insert num characters
*/
-protected void
+libedit_private void
c_insert(EditLine *el, int num)
{
wchar_t *cp;
@@ -119,7 +119,7 @@ c_insert(EditLine *el, int num)
/* c_delafter():
* Delete num characters after the cursor
*/
-protected void
+libedit_private void
c_delafter(EditLine *el, int num)
{
@@ -145,7 +145,7 @@ c_delafter(EditLine *el, int num)
/* c_delafter1():
* Delete the character after the cursor, do not yank
*/
-protected void
+libedit_private void
c_delafter1(EditLine *el)
{
wchar_t *cp;
@@ -160,7 +160,7 @@ c_delafter1(EditLine *el)
/* c_delbefore():
* Delete num characters before the cursor
*/
-protected void
+libedit_private void
c_delbefore(EditLine *el, int num)
{
@@ -188,7 +188,7 @@ c_delbefore(EditLine *el, int num)
/* c_delbefore1():
* Delete the character before the cursor, do not yank
*/
-protected void
+libedit_private void
c_delbefore1(EditLine *el)
{
wchar_t *cp;
@@ -203,7 +203,7 @@ c_delbefore1(EditLine *el)
/* ce__isword():
* Return if p is part of a word according to emacs
*/
-protected int
+libedit_private int
ce__isword(wint_t p)
{
return iswalnum(p) || wcschr(L"*?_-.[]~=", p) != NULL;
@@ -213,7 +213,7 @@ ce__isword(wint_t p)
/* cv__isword():
* Return if p is part of a word according to vi
*/
-protected int
+libedit_private int
cv__isword(wint_t p)
{
if (iswalnum(p) || p == L'_')
@@ -227,7 +227,7 @@ cv__isword(wint_t p)
/* cv__isWord():
* Return if p is part of a big word according to vi
*/
-protected int
+libedit_private int
cv__isWord(wint_t p)
{
return !iswspace(p);
@@ -237,7 +237,7 @@ cv__isWord(wint_t p)
/* c__prev_word():
* Find the previous word
*/
-protected wchar_t *
+libedit_private wchar_t *
c__prev_word(wchar_t *p, wchar_t *low, int n, int (*wtest)(wint_t))
{
p--;
@@ -261,7 +261,7 @@ c__prev_word(wchar_t *p, wchar_t *low, i
/* c__next_word():
* Find the next word
*/
-protected wchar_t *
+libedit_private wchar_t *
c__next_word(wchar_t *p, wchar_t *high, int n, int (*wtest)(wint_t))
{
while (n--) {
@@ -279,7 +279,7 @@ c__next_word(wchar_t *p, wchar_t *high,
/* cv_next_word():
* Find the next word vi style
*/
-protected wchar_t *
+libedit_private wchar_t *
cv_next_word(EditLine *el, wchar_t *p, wchar_t *high, int n,
int (*wtest)(wint_t))
{
@@ -309,7 +309,7 @@ cv_next_word(EditLine *el, wchar_t *p, w
/* cv_prev_word():
* Find the previous word vi style
*/
-protected wchar_t *
+libedit_private wchar_t *
cv_prev_word(wchar_t *p, wchar_t *low, int n, int (*wtest)(wint_t))
{
int test;
@@ -335,7 +335,7 @@ cv_prev_word(wchar_t *p, wchar_t *low, i
/* cv_delfini():
* Finish vi delete action
*/
-protected void
+libedit_private void
cv_delfini(EditLine *el)
{
int size;
@@ -373,7 +373,7 @@ cv_delfini(EditLine *el)
/* cv__endword():
* Go to the end of this word according to vi
*/
-protected wchar_t *
+libedit_private wchar_t *
cv__endword(wchar_t *p, wchar_t *high, int n, int (*wtest)(wint_t))
{
int test;
@@ -395,7 +395,7 @@ cv__endword(wchar_t *p, wchar_t *high, i
/* ch_init():
* Initialize the character editor
*/
-protected int
+libedit_private int
ch_init(EditLine *el)
{
c_macro_t *ma = &el->el_chared.c_macro;
@@ -462,7 +462,7 @@ ch_init(EditLine *el)
/* ch_reset():
* Reset the character editor
*/
-protected void
+libedit_private void
ch_reset(EditLine *el, int mclear)
{
el->el_line.cursor = el->el_line.buffer;
@@ -502,7 +502,7 @@ ch__clearmacro(EditLine *el)
* Enlarge line buffer to be able to hold twice as much characters.
* Returns 1 if successful, 0 if not.
*/
-protected int
+libedit_private int
ch_enlargebufs(EditLine *el, size_t addlen)
{
size_t sz, newsz;
@@ -591,7 +591,7 @@ ch_enlargebufs(EditLine *el, size_t addl
/* ch_end():
* Free the data structures used by the editor
*/
-protected void
+libedit_private void
ch_end(EditLine *el)
{
el_free(el->el_line.buffer);
@@ -674,7 +674,7 @@ out:
/* c_gets():
* Get a string
*/
-protected int
+libedit_private int
c_gets(EditLine *el, wchar_t *buf, const wchar_t *prompt)
{
ssize_t len;
@@ -739,7 +739,7 @@ c_gets(EditLine *el, wchar_t *buf, const
/* c_hpos():
* Return the current horizontal position of the cursor
*/
-protected int
+libedit_private int
c_hpos(EditLine *el)
{
wchar_t *ptr;
@@ -758,7 +758,7 @@ c_hpos(EditLine *el)
}
}
-protected int
+libedit_private int
ch_resizefun(EditLine *el, el_zfunc_t f, void *a)
{
el->el_chared.c_resizefun = f;
@@ -766,7 +766,7 @@ ch_resizefun(EditLine *el, el_zfunc_t f,
return 0;
}
-protected int
+libedit_private int
ch_aliasfun(EditLine *el, el_afunc_t f, void *a)
{
el->el_chared.c_aliasfun = f;
Index: src/lib/libedit/chared.h
diff -u src/lib/libedit/chared.h:1.28 src/lib/libedit/chared.h:1.29
--- src/lib/libedit/chared.h:1.28 Sun Apr 10 20:50:13 2016
+++ src/lib/libedit/chared.h Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: chared.h,v 1.28 2016/04/11 00:50:13 christos Exp $ */
+/* $NetBSD: chared.h,v 1.29 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -135,31 +135,31 @@ typedef struct el_chared_t {
#define MODE_REPLACE_1 2
-protected int cv__isword(wint_t);
-protected int cv__isWord(wint_t);
-protected void cv_delfini(EditLine *);
-protected wchar_t *cv__endword(wchar_t *, wchar_t *, int, int (*)(wint_t));
-protected int ce__isword(wint_t);
-protected void cv_undo(EditLine *);
-protected void cv_yank(EditLine *, const wchar_t *, int);
-protected wchar_t *cv_next_word(EditLine*, wchar_t *, wchar_t *, int,
+libedit_private int cv__isword(wint_t);
+libedit_private int cv__isWord(wint_t);
+libedit_private void cv_delfini(EditLine *);
+libedit_private wchar_t *cv__endword(wchar_t *, wchar_t *, int, int (*)(wint_t));
+libedit_private int ce__isword(wint_t);
+libedit_private void cv_undo(EditLine *);
+libedit_private void cv_yank(EditLine *, const wchar_t *, int);
+libedit_private wchar_t *cv_next_word(EditLine*, wchar_t *, wchar_t *, int,
int (*)(wint_t));
-protected wchar_t *cv_prev_word(wchar_t *, wchar_t *, int, int (*)(wint_t));
-protected wchar_t *c__next_word(wchar_t *, wchar_t *, int, int (*)(wint_t));
-protected wchar_t *c__prev_word(wchar_t *, wchar_t *, int, int (*)(wint_t));
-protected void c_insert(EditLine *, int);
-protected void c_delbefore(EditLine *, int);
-protected void c_delbefore1(EditLine *);
-protected void c_delafter(EditLine *, int);
-protected void c_delafter1(EditLine *);
-protected int c_gets(EditLine *, wchar_t *, const wchar_t *);
-protected int c_hpos(EditLine *);
-
-protected int ch_init(EditLine *);
-protected void ch_reset(EditLine *, int);
-protected int ch_resizefun(EditLine *, el_zfunc_t, void *);
-protected int ch_aliasfun(EditLine *, el_afunc_t, void *);
-protected int ch_enlargebufs(EditLine *, size_t);
-protected void ch_end(EditLine *);
+libedit_private wchar_t *cv_prev_word(wchar_t *, wchar_t *, int, int (*)(wint_t));
+libedit_private wchar_t *c__next_word(wchar_t *, wchar_t *, int, int (*)(wint_t));
+libedit_private wchar_t *c__prev_word(wchar_t *, wchar_t *, int, int (*)(wint_t));
+libedit_private void c_insert(EditLine *, int);
+libedit_private void c_delbefore(EditLine *, int);
+libedit_private void c_delbefore1(EditLine *);
+libedit_private void c_delafter(EditLine *, int);
+libedit_private void c_delafter1(EditLine *);
+libedit_private int c_gets(EditLine *, wchar_t *, const wchar_t *);
+libedit_private int c_hpos(EditLine *);
+
+libedit_private int ch_init(EditLine *);
+libedit_private void ch_reset(EditLine *, int);
+libedit_private int ch_resizefun(EditLine *, el_zfunc_t, void *);
+libedit_private int ch_aliasfun(EditLine *, el_afunc_t, void *);
+libedit_private int ch_enlargebufs(EditLine *, size_t);
+libedit_private void ch_end(EditLine *);
#endif /* _h_el_chared */
Index: src/lib/libedit/hist.c
diff -u src/lib/libedit/hist.c:1.28 src/lib/libedit/hist.c:1.29
--- src/lib/libedit/hist.c:1.28 Sun Apr 10 20:50:13 2016
+++ src/lib/libedit/hist.c Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: hist.c,v 1.28 2016/04/11 00:50:13 christos Exp $ */
+/* $NetBSD: hist.c,v 1.29 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)hist.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: hist.c,v 1.28 2016/04/11 00:50:13 christos Exp $");
+__RCSID("$NetBSD: hist.c,v 1.29 2016/05/09 21:46:56 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -52,7 +52,7 @@ __RCSID("$NetBSD: hist.c,v 1.28 2016/04/
/* hist_init():
* Initialization function.
*/
-protected int
+libedit_private int
hist_init(EditLine *el)
{
@@ -70,7 +70,7 @@ hist_init(EditLine *el)
/* hist_end():
* clean up history;
*/
-protected void
+libedit_private void
hist_end(EditLine *el)
{
@@ -82,7 +82,7 @@ hist_end(EditLine *el)
/* hist_set():
* Set new history interface
*/
-protected int
+libedit_private int
hist_set(EditLine *el, hist_fun_t fun, void *ptr)
{
@@ -96,7 +96,7 @@ hist_set(EditLine *el, hist_fun_t fun, v
* Get a history line and update it in the buffer.
* eventno tells us the event to get.
*/
-protected el_action_t
+libedit_private el_action_t
hist_get(EditLine *el)
{
const wchar_t *hp;
@@ -155,7 +155,7 @@ hist_get(EditLine *el)
/* hist_command()
* process a history command
*/
-protected int
+libedit_private int
hist_command(EditLine *el, int argc, const wchar_t **argv)
{
const wchar_t *str;
@@ -192,7 +192,7 @@ hist_command(EditLine *el, int argc, con
* Enlarge history buffer to specified value. Called from el_enlargebufs().
* Return 0 for failure, 1 for success.
*/
-protected int
+libedit_private int
/*ARGSUSED*/
hist_enlargebuf(EditLine *el, size_t oldsz, size_t newsz)
{
@@ -212,7 +212,7 @@ hist_enlargebuf(EditLine *el, size_t old
return 1;
}
-protected wchar_t *
+libedit_private wchar_t *
hist_convert(EditLine *el, int fn, void *arg)
{
HistEventW ev;
Index: src/lib/libedit/makelist
diff -u src/lib/libedit/makelist:1.28 src/lib/libedit/makelist:1.29
--- src/lib/libedit/makelist:1.28 Mon Apr 18 13:01:19 2016
+++ src/lib/libedit/makelist Mon May 9 17:46:56 2016
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: makelist,v 1.28 2016/04/18 17:01:19 christos Exp $
+# $NetBSD: makelist,v 1.29 2016/05/09 21:46:56 christos Exp $
#
# Copyright (c) 1992, 1993
# The Regents of the University of California. All rights reserved.
@@ -67,7 +67,7 @@ case $FLAG in
# XXX: need a space between name and prototype so that -fc and -fh
# parsing is much easier
#
- printf("protected el_action_t\t%s (EditLine *, wint_t);\n",
+ printf("libedit_private el_action_t\t%s (EditLine *, wint_t);\n",
name);
}
}
Index: src/lib/libedit/chartype.c
diff -u src/lib/libedit/chartype.c:1.29 src/lib/libedit/chartype.c:1.30
--- src/lib/libedit/chartype.c:1.29 Mon May 2 12:48:34 2016
+++ src/lib/libedit/chartype.c Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: chartype.c,v 1.29 2016/05/02 16:48:34 christos Exp $ */
+/* $NetBSD: chartype.c,v 1.30 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include "config.h"
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: chartype.c,v 1.29 2016/05/02 16:48:34 christos Exp $");
+__RCSID("$NetBSD: chartype.c,v 1.30 2016/05/09 21:46:56 christos Exp $");
#endif /* not lint && not SCCSID */
#include <ctype.h>
@@ -139,7 +139,7 @@ ct_decode_string(const char *s, ct_buffe
}
-protected wchar_t **
+libedit_private wchar_t **
ct_decode_argv(int argc, const char *argv[], ct_buffer_t *conv)
{
size_t bufspace;
@@ -179,7 +179,7 @@ ct_decode_argv(int argc, const char *arg
}
-protected size_t
+libedit_private size_t
ct_enc_width(wchar_t c)
{
/* UTF-8 encoding specific values */
@@ -195,7 +195,7 @@ ct_enc_width(wchar_t c)
return 0; /* not a valid codepoint */
}
-protected ssize_t
+libedit_private ssize_t
ct_encode_char(char *dst, size_t len, wchar_t c)
{
ssize_t l = 0;
@@ -210,7 +210,7 @@ ct_encode_char(char *dst, size_t len, wc
return l;
}
-protected const wchar_t *
+libedit_private const wchar_t *
ct_visual_string(const wchar_t *s, ct_buffer_t *conv)
{
wchar_t *dst;
@@ -253,7 +253,7 @@ ct_visual_string(const wchar_t *s, ct_bu
-protected int
+libedit_private int
ct_visual_width(wchar_t c)
{
int t = ct_chr_class(c);
@@ -277,7 +277,7 @@ ct_visual_width(wchar_t c)
}
-protected ssize_t
+libedit_private ssize_t
ct_visual_char(wchar_t *dst, size_t len, wchar_t c)
{
int t = ct_chr_class(c);
@@ -324,7 +324,7 @@ ct_visual_char(wchar_t *dst, size_t len,
-protected int
+libedit_private int
ct_chr_class(wchar_t c)
{
if (c == '\t')
Index: src/lib/libedit/chartype.h
diff -u src/lib/libedit/chartype.h:1.33 src/lib/libedit/chartype.h:1.34
--- src/lib/libedit/chartype.h:1.33 Mon May 2 12:48:34 2016
+++ src/lib/libedit/chartype.h Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: chartype.h,v 1.33 2016/05/02 16:48:34 christos Exp $ */
+/* $NetBSD: chartype.h,v 1.34 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -67,13 +67,13 @@ wchar_t *ct_decode_string(const char *,
/* Decode a (multi)?byte argv string array.
* The pointer returned must be free()d when done. */
-protected wchar_t **ct_decode_argv(int, const char *[], ct_buffer_t *);
+libedit_private wchar_t **ct_decode_argv(int, const char *[], ct_buffer_t *);
/* Encode a character into the destination buffer, provided there is sufficient
* buffer space available. Returns the number of bytes used up (zero if the
* character cannot be encoded, -1 if there was not enough space available). */
-protected ssize_t ct_encode_char(char *, size_t, wchar_t);
-protected size_t ct_enc_width(wchar_t);
+libedit_private ssize_t ct_encode_char(char *, size_t, wchar_t);
+libedit_private size_t ct_enc_width(wchar_t);
/* The maximum buffer size to hold the most unwieldy visual representation,
* in this case \U+nnnnn. */
@@ -86,16 +86,16 @@ protected size_t ct_enc_width(wchar_t);
/* Visual width of character c, taking into account ^? , \0177 and \U+nnnnn
* style visual expansions. */
-protected int ct_visual_width(wchar_t);
+libedit_private int ct_visual_width(wchar_t);
/* Turn the given character into the appropriate visual format, matching
* the width given by ct_visual_width(). Returns the number of characters used
* up, or -1 if insufficient space. Buffer length is in count of wchar_t's. */
-protected ssize_t ct_visual_char(wchar_t *, size_t, wchar_t);
+libedit_private ssize_t ct_visual_char(wchar_t *, size_t, wchar_t);
/* Convert the given string into visual format, using the ct_visual_char()
* function. Uses a static buffer, so not threadsafe. */
-protected const wchar_t *ct_visual_string(const wchar_t *, ct_buffer_t *);
+libedit_private const wchar_t *ct_visual_string(const wchar_t *, ct_buffer_t *);
/* printable character, use ct_visual_width() to find out display width */
@@ -109,6 +109,6 @@ protected const wchar_t *ct_visual_strin
/* non-printable character */
#define CHTYPE_NONPRINT (-4)
/* classification of character c, as one of the above defines */
-protected int ct_chr_class(wchar_t c);
+libedit_private int ct_chr_class(wchar_t c);
#endif /* _chartype_f */
Index: src/lib/libedit/common.c
diff -u src/lib/libedit/common.c:1.45 src/lib/libedit/common.c:1.46
--- src/lib/libedit/common.c:1.45 Mon Apr 18 13:01:19 2016
+++ src/lib/libedit/common.c Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: common.c,v 1.45 2016/04/18 17:01:19 christos Exp $ */
+/* $NetBSD: common.c,v 1.46 2016/05/09 21:46:56 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.45 2016/04/18 17:01:19 christos Exp $");
+__RCSID("$NetBSD: common.c,v 1.46 2016/05/09 21:46:56 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -57,7 +57,7 @@ __RCSID("$NetBSD: common.c,v 1.45 2016/0
* Indicate end of file
* [^D]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
ed_end_of_file(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -72,7 +72,7 @@ ed_end_of_file(EditLine *el, wint_t c __
* Add character to the line
* Insert a character [bound to all insert keys]
*/
-protected el_action_t
+libedit_private el_action_t
ed_insert(EditLine *el, wint_t c)
{
int count = el->el_state.argument;
@@ -114,7 +114,7 @@ ed_insert(EditLine *el, wint_t c)
* Delete from beginning of current word to cursor
* [M-^?] [^W]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
ed_delete_prev_word(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -142,7 +142,7 @@ ed_delete_prev_word(EditLine *el, wint_t
* Delete character under cursor
* [^D] [x]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
ed_delete_next_char(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -189,7 +189,7 @@ ed_delete_next_char(EditLine *el, wint_t
* Cut to the end of line
* [^K] [^K]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
ed_kill_line(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -210,7 +210,7 @@ ed_kill_line(EditLine *el, wint_t c __at
* Move cursor to the end of line
* [^E] [^E]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
ed_move_to_end(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -233,7 +233,7 @@ ed_move_to_end(EditLine *el, wint_t c __
* Move cursor to the beginning of line
* [^A] [^A]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
ed_move_to_beg(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -257,7 +257,7 @@ ed_move_to_beg(EditLine *el, wint_t c __
* Exchange the character to the left of the cursor with the one under it
* [^T] [^T]
*/
-protected el_action_t
+libedit_private el_action_t
ed_transpose_chars(EditLine *el, wint_t c)
{
@@ -282,7 +282,7 @@ ed_transpose_chars(EditLine *el, wint_t
* Move to the right one character
* [^F] [^F]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
ed_next_char(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -311,7 +311,7 @@ ed_next_char(EditLine *el, wint_t c __at
* Move to the beginning of the current word
* [M-b] [b]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
ed_prev_word(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -337,7 +337,7 @@ ed_prev_word(EditLine *el, wint_t c __at
* Move to the left one character
* [^B] [^B]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
ed_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -362,7 +362,7 @@ ed_prev_char(EditLine *el, wint_t c __at
* Add the next character typed verbatim
* [^V] [^V]
*/
-protected el_action_t
+libedit_private el_action_t
ed_quoted_insert(EditLine *el, wint_t c)
{
int num;
@@ -380,7 +380,7 @@ ed_quoted_insert(EditLine *el, wint_t c)
/* ed_digit():
* Adds to argument or enters a digit
*/
-protected el_action_t
+libedit_private el_action_t
ed_digit(EditLine *el, wint_t c)
{
@@ -408,7 +408,7 @@ ed_digit(EditLine *el, wint_t c)
* Digit that starts argument
* For ESC-n
*/
-protected el_action_t
+libedit_private el_action_t
ed_argument_digit(EditLine *el, wint_t c)
{
@@ -432,7 +432,7 @@ ed_argument_digit(EditLine *el, wint_t c
* Indicates unbound character
* Bound to keys that are not assigned
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
ed_unassigned(EditLine *el __attribute__((__unused__)),
wint_t c __attribute__((__unused__)))
@@ -446,7 +446,7 @@ ed_unassigned(EditLine *el __attribute__
* Input characters that have no effect
* [^C ^O ^Q ^S ^Z ^\ ^]] [^C ^O ^Q ^S ^\]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
ed_ignore(EditLine *el __attribute__((__unused__)),
wint_t c __attribute__((__unused__)))
@@ -460,7 +460,7 @@ ed_ignore(EditLine *el __attribute__((__
* Execute command
* [^J]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
ed_newline(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -476,7 +476,7 @@ ed_newline(EditLine *el, wint_t c __attr
* Delete the character to the left of the cursor
* [^?]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
ed_delete_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -496,7 +496,7 @@ ed_delete_prev_char(EditLine *el, wint_t
* Clear screen leaving current line at the top
* [^L]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
ed_clear_screen(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -511,7 +511,7 @@ ed_clear_screen(EditLine *el, wint_t c _
* Redisplay everything
* ^R
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
ed_redisplay(EditLine *el __attribute__((__unused__)),
wint_t c __attribute__((__unused__)))
@@ -525,7 +525,7 @@ ed_redisplay(EditLine *el __attribute__(
* Erase current line and start from scratch
* [^G]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
ed_start_over(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -539,7 +539,7 @@ ed_start_over(EditLine *el, wint_t c __a
* First character in a bound sequence
* Placeholder for external keys
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
ed_sequence_lead_in(EditLine *el __attribute__((__unused__)),
wint_t c __attribute__((__unused__)))
@@ -553,7 +553,7 @@ ed_sequence_lead_in(EditLine *el __attri
* Move to the previous history line
* [^P] [k]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
ed_prev_history(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -590,7 +590,7 @@ ed_prev_history(EditLine *el, wint_t c _
* Move to the next history line
* [^N] [j]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
ed_next_history(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -617,7 +617,7 @@ ed_next_history(EditLine *el, wint_t c _
* Search previous in history for a line matching the current
* next search history [M-P] [K]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
ed_search_prev_history(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -685,7 +685,7 @@ ed_search_prev_history(EditLine *el, win
* Search next in history for a line matching the current
* [M-N] [J]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
ed_search_next_history(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -739,7 +739,7 @@ ed_search_next_history(EditLine *el, win
* Move up one line
* Could be [k] [^p]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
ed_prev_line(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -782,7 +782,7 @@ ed_prev_line(EditLine *el, wint_t c __at
* Move down one line
* Could be [j] [^n]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
ed_next_line(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -816,7 +816,7 @@ ed_next_line(EditLine *el, wint_t c __at
* Editline extended command
* [M-X] [:]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
ed_command(EditLine *el, wint_t c __attribute__((__unused__)))
{
Index: src/lib/libedit/el.c
diff -u src/lib/libedit/el.c:1.90 src/lib/libedit/el.c:1.91
--- src/lib/libedit/el.c:1.90 Mon May 2 12:48:34 2016
+++ src/lib/libedit/el.c Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: el.c,v 1.90 2016/05/02 16:48:34 christos Exp $ */
+/* $NetBSD: el.c,v 1.91 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)el.c 8.2 (Berkeley) 1/3/94";
#else
-__RCSID("$NetBSD: el.c,v 1.90 2016/05/02 16:48:34 christos Exp $");
+__RCSID("$NetBSD: el.c,v 1.91 2016/05/09 21:46:56 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -613,7 +613,7 @@ el_beep(EditLine *el)
/* el_editmode()
* Set the state of EDIT_DISABLED from the `edit' command.
*/
-protected int
+libedit_private int
/*ARGSUSED*/
el_editmode(EditLine *el, int argc, const wchar_t **argv)
{
Index: src/lib/libedit/el.h
diff -u src/lib/libedit/el.h:1.39 src/lib/libedit/el.h:1.40
--- src/lib/libedit/el.h:1.39 Mon May 2 12:48:34 2016
+++ src/lib/libedit/el.h Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: el.h,v 1.39 2016/05/02 16:48:34 christos Exp $ */
+/* $NetBSD: el.h,v 1.40 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -139,7 +139,7 @@ struct editline {
LineInfo el_lgcylinfo; /* Legacy LineInfo buffer */
};
-protected int el_editmode(EditLine *, int, const wchar_t **);
+libedit_private int el_editmode(EditLine *, int, const wchar_t **);
#ifdef DEBUG
#define EL_ABORT(a) do { \
Index: src/lib/libedit/parse.c
diff -u src/lib/libedit/parse.c:1.39 src/lib/libedit/parse.c:1.40
--- src/lib/libedit/parse.c:1.39 Mon Apr 11 18:30:14 2016
+++ src/lib/libedit/parse.c Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.39 2016/04/11 22:30:14 christos Exp $ */
+/* $NetBSD: parse.c,v 1.40 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: parse.c,v 1.39 2016/04/11 22:30:14 christos Exp $");
+__RCSID("$NetBSD: parse.c,v 1.40 2016/05/09 21:46:56 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -78,7 +78,7 @@ static const struct {
/* parse_line():
* Parse a line and dispatch it
*/
-protected int
+libedit_private int
parse_line(EditLine *el, const wchar_t *line)
{
const wchar_t **argv;
@@ -138,7 +138,7 @@ el_wparse(EditLine *el, int argc, const
* Parse a string of the form ^<char> \<odigit> \<char> \U+xxxx and return
* the appropriate character or -1 if the escape is not valid
*/
-protected int
+libedit_private int
parse__escape(const wchar_t **ptr)
{
const wchar_t *p;
@@ -238,7 +238,7 @@ parse__escape(const wchar_t **ptr)
/* parse__string():
* Parse the escapes from in and put the raw string out
*/
-protected wchar_t *
+libedit_private wchar_t *
parse__string(wchar_t *out, const wchar_t *in)
{
wchar_t *rv = out;
@@ -276,7 +276,7 @@ parse__string(wchar_t *out, const wchar_
* Return the command number for the command string given
* or -1 if one is not found
*/
-protected int
+libedit_private int
parse_cmd(EditLine *el, const wchar_t *cmd)
{
el_bindings_t *b = el->el_map.help;
Index: src/lib/libedit/emacs.c
diff -u src/lib/libedit/emacs.c:1.35 src/lib/libedit/emacs.c:1.36
--- src/lib/libedit/emacs.c:1.35 Mon Apr 18 13:01:19 2016
+++ src/lib/libedit/emacs.c Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: emacs.c,v 1.35 2016/04/18 17:01:19 christos Exp $ */
+/* $NetBSD: emacs.c,v 1.36 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)emacs.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: emacs.c,v 1.35 2016/04/18 17:01:19 christos Exp $");
+__RCSID("$NetBSD: emacs.c,v 1.36 2016/05/09 21:46:56 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -54,7 +54,7 @@ __RCSID("$NetBSD: emacs.c,v 1.35 2016/04
* Delete character under cursor or list completions if at end of line
* [^D]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
em_delete_or_list(EditLine *el, wint_t c)
{
@@ -90,7 +90,7 @@ em_delete_or_list(EditLine *el, wint_t c
* Cut from cursor to end of current word
* [M-d]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
em_delete_next_word(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -119,7 +119,7 @@ em_delete_next_word(EditLine *el, wint_t
* Paste cut buffer at cursor position
* [^Y]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
em_yank(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -155,7 +155,7 @@ em_yank(EditLine *el, wint_t c __attribu
* Cut the entire line and save in cut buffer
* [^U]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
em_kill_line(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -177,7 +177,7 @@ em_kill_line(EditLine *el, wint_t c __at
* Cut area between mark and cursor and save in cut buffer
* [^W]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
em_kill_region(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -210,7 +210,7 @@ em_kill_region(EditLine *el, wint_t c __
* Copy area between mark and cursor to cut buffer
* [M-W]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
em_copy_region(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -240,7 +240,7 @@ em_copy_region(EditLine *el, wint_t c __
* Exchange the two characters before the cursor
* Gosling emacs transpose chars [^T]
*/
-protected el_action_t
+libedit_private el_action_t
em_gosmacs_transpose(EditLine *el, wint_t c)
{
@@ -259,7 +259,7 @@ em_gosmacs_transpose(EditLine *el, wint_
* Move next to end of current word
* [M-f]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
em_next_word(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -284,7 +284,7 @@ em_next_word(EditLine *el, wint_t c __at
* Uppercase the characters from cursor to end of current word
* [M-u]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
em_upper_case(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -308,7 +308,7 @@ em_upper_case(EditLine *el, wint_t c __a
* Capitalize the characters from cursor to end of current word
* [M-c]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
em_capitol_case(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -340,7 +340,7 @@ em_capitol_case(EditLine *el, wint_t c _
* Lowercase the characters from cursor to end of current word
* [M-l]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
em_lower_case(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -364,7 +364,7 @@ em_lower_case(EditLine *el, wint_t c __a
* Set the mark at cursor
* [^@]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
em_set_mark(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -378,7 +378,7 @@ em_set_mark(EditLine *el, wint_t c __att
* Exchange the cursor and mark
* [^X^X]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
em_exchange_mark(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -395,7 +395,7 @@ em_exchange_mark(EditLine *el, wint_t c
* Universal argument (argument times 4)
* [^U]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
em_universal_argument(EditLine *el, wint_t c __attribute__((__unused__)))
{ /* multiply current argument by 4 */
@@ -412,7 +412,7 @@ em_universal_argument(EditLine *el, wint
* Add 8th bit to next character typed
* [<ESC>]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
em_meta_next(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -425,7 +425,7 @@ em_meta_next(EditLine *el, wint_t c __at
/* em_toggle_overwrite():
* Switch from insert to overwrite mode or vice versa
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
em_toggle_overwrite(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -439,7 +439,7 @@ em_toggle_overwrite(EditLine *el, wint_t
/* em_copy_prev_word():
* Copy current word to cursor
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
em_copy_prev_word(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -466,7 +466,7 @@ em_copy_prev_word(EditLine *el, wint_t c
/* em_inc_search_next():
* Emacs incremental next search
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
em_inc_search_next(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -479,7 +479,7 @@ em_inc_search_next(EditLine *el, wint_t
/* em_inc_search_prev():
* Emacs incremental reverse search
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
em_inc_search_prev(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -493,7 +493,7 @@ em_inc_search_prev(EditLine *el, wint_t
* Delete the character to the left of the cursor
* [^?]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
em_delete_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
{
Index: src/lib/libedit/hist.h
diff -u src/lib/libedit/hist.h:1.21 src/lib/libedit/hist.h:1.22
--- src/lib/libedit/hist.h:1.21 Sun Apr 10 20:50:13 2016
+++ src/lib/libedit/hist.h Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: hist.h,v 1.21 2016/04/11 00:50:13 christos Exp $ */
+/* $NetBSD: hist.h,v 1.22 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -68,12 +68,12 @@ typedef struct el_history_t {
#define HIST_SAVE(el, fname) HIST_FUN(el, H_SAVE fname)
#define HIST_SAVE_FP(el, fp) HIST_FUN(el, H_SAVE_FP fp)
-protected int hist_init(EditLine *);
-protected void hist_end(EditLine *);
-protected el_action_t hist_get(EditLine *);
-protected int hist_set(EditLine *, hist_fun_t, void *);
-protected int hist_command(EditLine *, int, const wchar_t **);
-protected int hist_enlargebuf(EditLine *, size_t, size_t);
-protected wchar_t *hist_convert(EditLine *, int, void *);
+libedit_private int hist_init(EditLine *);
+libedit_private void hist_end(EditLine *);
+libedit_private el_action_t hist_get(EditLine *);
+libedit_private int hist_set(EditLine *, hist_fun_t, void *);
+libedit_private int hist_command(EditLine *, int, const wchar_t **);
+libedit_private int hist_enlargebuf(EditLine *, size_t, size_t);
+libedit_private wchar_t *hist_convert(EditLine *, int, void *);
#endif /* _h_el_hist */
Index: src/lib/libedit/keymacro.c
diff -u src/lib/libedit/keymacro.c:1.21 src/lib/libedit/keymacro.c:1.22
--- src/lib/libedit/keymacro.c:1.21 Mon Apr 18 13:01:19 2016
+++ src/lib/libedit/keymacro.c Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: keymacro.c,v 1.21 2016/04/18 17:01:19 christos Exp $ */
+/* $NetBSD: keymacro.c,v 1.22 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)key.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: keymacro.c,v 1.21 2016/04/18 17:01:19 christos Exp $");
+__RCSID("$NetBSD: keymacro.c,v 1.22 2016/05/09 21:46:56 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -101,7 +101,7 @@ static int node_enum(EditLine *, keyma
/* keymacro_init():
* Initialize the key maps
*/
-protected int
+libedit_private int
keymacro_init(EditLine *el)
{
@@ -117,7 +117,7 @@ keymacro_init(EditLine *el)
/* keymacro_end():
* Free the key maps
*/
-protected void
+libedit_private void
keymacro_end(EditLine *el)
{
@@ -130,7 +130,7 @@ keymacro_end(EditLine *el)
/* keymacro_map_cmd():
* Associate cmd with a key value
*/
-protected keymacro_value_t *
+libedit_private keymacro_value_t *
keymacro_map_cmd(EditLine *el, int cmd)
{
@@ -142,7 +142,7 @@ keymacro_map_cmd(EditLine *el, int cmd)
/* keymacro_map_str():
* Associate str with a key value
*/
-protected keymacro_value_t *
+libedit_private keymacro_value_t *
keymacro_map_str(EditLine *el, wchar_t *str)
{
@@ -156,7 +156,7 @@ keymacro_map_str(EditLine *el, wchar_t *
* Then initializes el->el_keymacro.map with arrow keys
* [Always bind the ansi arrow keys?]
*/
-protected void
+libedit_private void
keymacro_reset(EditLine *el)
{
@@ -174,7 +174,7 @@ keymacro_reset(EditLine *el)
* Returns NULL in val.str and XK_STR for no match.
* The last character read is returned in *ch.
*/
-protected int
+libedit_private int
keymacro_get(EditLine *el, wchar_t *ch, keymacro_value_t *val)
{
@@ -188,7 +188,7 @@ keymacro_get(EditLine *el, wchar_t *ch,
* code is applied to the existing key. Ntype specifies if code is a
* command, an out str or a unix command.
*/
-protected void
+libedit_private void
keymacro_add(EditLine *el, const wchar_t *key, keymacro_value_t *val,
int ntype)
{
@@ -217,7 +217,7 @@ keymacro_add(EditLine *el, const wchar_t
/* keymacro_clear():
*
*/
-protected void
+libedit_private void
keymacro_clear(EditLine *el, el_action_t *map, const wchar_t *in)
{
if (*in > N_KEYS) /* can't be in the map */
@@ -235,7 +235,7 @@ keymacro_clear(EditLine *el, el_action_t
* Delete the key and all longer keys staring with key, if
* they exists.
*/
-protected int
+libedit_private int
keymacro_delete(EditLine *el, const wchar_t *key)
{
@@ -256,7 +256,7 @@ keymacro_delete(EditLine *el, const wcha
* Print the binding associated with key key.
* Print entire el->el_keymacro.map if null
*/
-protected void
+libedit_private void
keymacro_print(EditLine *el, const wchar_t *key)
{
@@ -581,7 +581,7 @@ node_enum(EditLine *el, keymacro_node_t
* Print the specified key and its associated
* function specified by val
*/
-protected void
+libedit_private void
keymacro_kprint(EditLine *el, const wchar_t *key, keymacro_value_t *val,
int ntype)
{
@@ -632,7 +632,7 @@ keymacro_kprint(EditLine *el, const wcha
/* keymacro__decode_str():
* Make a printable version of the ey
*/
-protected size_t
+libedit_private size_t
keymacro__decode_str(const wchar_t *str, char *buf, size_t len,
const char *sep)
{
Index: src/lib/libedit/keymacro.h
diff -u src/lib/libedit/keymacro.h:1.5 src/lib/libedit/keymacro.h:1.6
--- src/lib/libedit/keymacro.h:1.5 Mon Apr 11 20:16:06 2016
+++ src/lib/libedit/keymacro.h Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: keymacro.h,v 1.5 2016/04/12 00:16:06 christos Exp $ */
+/* $NetBSD: keymacro.h,v 1.6 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -57,20 +57,20 @@ typedef struct el_keymacro_t {
#define XK_STR 1
#define XK_NOD 2
-protected int keymacro_init(EditLine *);
-protected void keymacro_end(EditLine *);
-protected keymacro_value_t *keymacro_map_cmd(EditLine *, int);
-protected keymacro_value_t *keymacro_map_str(EditLine *, wchar_t *);
-protected void keymacro_reset(EditLine *);
-protected int keymacro_get(EditLine *, wchar_t *, keymacro_value_t *);
-protected void keymacro_add(EditLine *, const wchar_t *,
+libedit_private int keymacro_init(EditLine *);
+libedit_private void keymacro_end(EditLine *);
+libedit_private keymacro_value_t *keymacro_map_cmd(EditLine *, int);
+libedit_private keymacro_value_t *keymacro_map_str(EditLine *, wchar_t *);
+libedit_private void keymacro_reset(EditLine *);
+libedit_private int keymacro_get(EditLine *, wchar_t *, keymacro_value_t *);
+libedit_private void keymacro_add(EditLine *, const wchar_t *,
keymacro_value_t *, int);
-protected void keymacro_clear(EditLine *, el_action_t *, const wchar_t *);
-protected int keymacro_delete(EditLine *, const wchar_t *);
-protected void keymacro_print(EditLine *, const wchar_t *);
-protected void keymacro_kprint(EditLine *, const wchar_t *,
+libedit_private void keymacro_clear(EditLine *, el_action_t *, const wchar_t *);
+libedit_private int keymacro_delete(EditLine *, const wchar_t *);
+libedit_private void keymacro_print(EditLine *, const wchar_t *);
+libedit_private void keymacro_kprint(EditLine *, const wchar_t *,
keymacro_value_t *, int);
-protected size_t keymacro__decode_str(const wchar_t *, char *, size_t,
+libedit_private size_t keymacro__decode_str(const wchar_t *, char *, size_t,
const char *);
#endif /* _h_el_keymacro */
Index: src/lib/libedit/map.c
diff -u src/lib/libedit/map.c:1.50 src/lib/libedit/map.c:1.51
--- src/lib/libedit/map.c:1.50 Mon Apr 18 13:01:19 2016
+++ src/lib/libedit/map.c Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: map.c,v 1.50 2016/04/18 17:01:19 christos Exp $ */
+/* $NetBSD: map.c,v 1.51 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)map.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: map.c,v 1.50 2016/04/18 17:01:19 christos Exp $");
+__RCSID("$NetBSD: map.c,v 1.51 2016/05/09 21:46:56 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -897,7 +897,7 @@ static const el_action_t el_map_vi_comma
/* map_init():
* Initialize and allocate the maps
*/
-protected int
+libedit_private int
map_init(EditLine *el)
{
@@ -946,7 +946,7 @@ map_init(EditLine *el)
/* map_end():
* Free the space taken by the editor maps
*/
-protected void
+libedit_private void
map_end(EditLine *el)
{
@@ -1024,7 +1024,7 @@ map_init_meta(EditLine *el)
/* map_init_vi():
* Initialize the vi bindings
*/
-protected void
+libedit_private void
map_init_vi(EditLine *el)
{
int i;
@@ -1054,7 +1054,7 @@ map_init_vi(EditLine *el)
/* map_init_emacs():
* Initialize the emacs bindings
*/
-protected void
+libedit_private void
map_init_emacs(EditLine *el)
{
int i;
@@ -1088,7 +1088,7 @@ map_init_emacs(EditLine *el)
/* map_set_editor():
* Set the editor
*/
-protected int
+libedit_private int
map_set_editor(EditLine *el, wchar_t *editor)
{
@@ -1107,7 +1107,7 @@ map_set_editor(EditLine *el, wchar_t *ed
/* map_get_editor():
* Retrieve the editor
*/
-protected int
+libedit_private int
map_get_editor(EditLine *el, const wchar_t **editor)
{
@@ -1250,7 +1250,7 @@ map_print_all_keys(EditLine *el)
/* map_bind():
* Add/remove/change bindings
*/
-protected int
+libedit_private int
map_bind(EditLine *el, int argc, const wchar_t **argv)
{
el_action_t *map;
@@ -1396,7 +1396,7 @@ map_bind(EditLine *el, int argc, const w
/* map_addfunc():
* add a user defined function
*/
-protected int
+libedit_private int
map_addfunc(EditLine *el, const wchar_t *name, const wchar_t *help,
el_func_t func)
{
Index: src/lib/libedit/refresh.c
diff -u src/lib/libedit/refresh.c:1.50 src/lib/libedit/refresh.c:1.51
--- src/lib/libedit/refresh.c:1.50 Mon May 2 12:35:17 2016
+++ src/lib/libedit/refresh.c Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: refresh.c,v 1.50 2016/05/02 16:35:17 christos Exp $ */
+/* $NetBSD: refresh.c,v 1.51 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)refresh.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: refresh.c,v 1.50 2016/05/02 16:35:17 christos Exp $");
+__RCSID("$NetBSD: refresh.c,v 1.51 2016/05/09 21:46:56 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -159,7 +159,7 @@ re_addc(EditLine *el, wint_t c)
/* re_putc():
* Draw the character given
*/
-protected void
+libedit_private void
re_putc(EditLine *el, wint_t c, int shift)
{
int i, w = wcwidth(c);
@@ -197,7 +197,7 @@ re_putc(EditLine *el, wint_t c, int shif
* virtual image. The routine to re-draw a line can be replaced
* easily in hopes of a smarter one being placed there.
*/
-protected void
+libedit_private void
re_refresh(EditLine *el)
{
int i, rhdiff;
@@ -342,7 +342,7 @@ re_refresh(EditLine *el)
/* re_goto_bottom():
* used to go to last used screen line
*/
-protected void
+libedit_private void
re_goto_bottom(EditLine *el)
{
@@ -992,7 +992,7 @@ re__copy_and_pad(wchar_t *dst, const wch
/* re_refresh_cursor():
* Move to the new cursor position
*/
-protected void
+libedit_private void
re_refresh_cursor(EditLine *el)
{
wchar_t *cp;
@@ -1108,7 +1108,7 @@ re_fastputc(EditLine *el, wint_t c)
* we added just one char, handle it fast.
* Assumes that screen cursor == real cursor
*/
-protected void
+libedit_private void
re_fastaddc(EditLine *el)
{
wchar_t c;
@@ -1150,7 +1150,7 @@ re_fastaddc(EditLine *el)
/* re_clear_display():
* clear the screen buffers so that new new prompt starts fresh.
*/
-protected void
+libedit_private void
re_clear_display(EditLine *el)
{
int i;
@@ -1166,7 +1166,7 @@ re_clear_display(EditLine *el)
/* re_clear_lines():
* Make sure all lines are *really* blank
*/
-protected void
+libedit_private void
re_clear_lines(EditLine *el)
{
Index: src/lib/libedit/map.h
diff -u src/lib/libedit/map.h:1.12 src/lib/libedit/map.h:1.13
--- src/lib/libedit/map.h:1.12 Mon Apr 18 13:01:19 2016
+++ src/lib/libedit/map.h Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: map.h,v 1.12 2016/04/18 17:01:19 christos Exp $ */
+/* $NetBSD: map.h,v 1.13 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -66,14 +66,14 @@ typedef struct el_map_t {
#define N_KEYS 256
-protected int map_bind(EditLine *, int, const wchar_t **);
-protected int map_init(EditLine *);
-protected void map_end(EditLine *);
-protected void map_init_vi(EditLine *);
-protected void map_init_emacs(EditLine *);
-protected int map_set_editor(EditLine *, wchar_t *);
-protected int map_get_editor(EditLine *, const wchar_t **);
-protected int map_addfunc(EditLine *, const wchar_t *, const wchar_t *,
+libedit_private int map_bind(EditLine *, int, const wchar_t **);
+libedit_private int map_init(EditLine *);
+libedit_private void map_end(EditLine *);
+libedit_private void map_init_vi(EditLine *);
+libedit_private void map_init_emacs(EditLine *);
+libedit_private int map_set_editor(EditLine *, wchar_t *);
+libedit_private int map_get_editor(EditLine *, const wchar_t **);
+libedit_private int map_addfunc(EditLine *, const wchar_t *, const wchar_t *,
el_func_t);
#endif /* _h_el_map */
Index: src/lib/libedit/parse.h
diff -u src/lib/libedit/parse.h:1.8 src/lib/libedit/parse.h:1.9
--- src/lib/libedit/parse.h:1.8 Sun Apr 10 20:50:13 2016
+++ src/lib/libedit/parse.h Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.h,v 1.8 2016/04/11 00:50:13 christos Exp $ */
+/* $NetBSD: parse.h,v 1.9 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -40,9 +40,9 @@
#ifndef _h_el_parse
#define _h_el_parse
-protected int parse_line(EditLine *, const wchar_t *);
-protected int parse__escape(const wchar_t **);
-protected wchar_t *parse__string(wchar_t *, const wchar_t *);
-protected int parse_cmd(EditLine *, const wchar_t *);
+libedit_private int parse_line(EditLine *, const wchar_t *);
+libedit_private int parse__escape(const wchar_t **);
+libedit_private wchar_t *parse__string(wchar_t *, const wchar_t *);
+libedit_private int parse_cmd(EditLine *, const wchar_t *);
#endif /* _h_el_parse */
Index: src/lib/libedit/terminal.h
diff -u src/lib/libedit/terminal.h:1.8 src/lib/libedit/terminal.h:1.9
--- src/lib/libedit/terminal.h:1.8 Sun Apr 10 20:50:13 2016
+++ src/lib/libedit/terminal.h Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: terminal.h,v 1.8 2016/04/11 00:50:13 christos Exp $ */
+/* $NetBSD: terminal.h,v 1.9 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -80,32 +80,32 @@ typedef struct {
#define A_K_DE 6
#define A_K_NKEYS 7
-protected void terminal_move_to_line(EditLine *, int);
-protected void terminal_move_to_char(EditLine *, int);
-protected void terminal_clear_EOL(EditLine *, int);
-protected void terminal_overwrite(EditLine *, const wchar_t *, size_t);
-protected void terminal_insertwrite(EditLine *, wchar_t *, int);
-protected void terminal_deletechars(EditLine *, int);
-protected void terminal_clear_screen(EditLine *);
-protected void terminal_beep(EditLine *);
-protected int terminal_change_size(EditLine *, int, int);
-protected int terminal_get_size(EditLine *, int *, int *);
-protected int terminal_init(EditLine *);
-protected void terminal_bind_arrow(EditLine *);
-protected void terminal_print_arrow(EditLine *, const wchar_t *);
-protected int terminal_clear_arrow(EditLine *, const wchar_t *);
-protected int terminal_set_arrow(EditLine *, const wchar_t *,
+libedit_private void terminal_move_to_line(EditLine *, int);
+libedit_private void terminal_move_to_char(EditLine *, int);
+libedit_private void terminal_clear_EOL(EditLine *, int);
+libedit_private void terminal_overwrite(EditLine *, const wchar_t *, size_t);
+libedit_private void terminal_insertwrite(EditLine *, wchar_t *, int);
+libedit_private void terminal_deletechars(EditLine *, int);
+libedit_private void terminal_clear_screen(EditLine *);
+libedit_private void terminal_beep(EditLine *);
+libedit_private int terminal_change_size(EditLine *, int, int);
+libedit_private int terminal_get_size(EditLine *, int *, int *);
+libedit_private int terminal_init(EditLine *);
+libedit_private void terminal_bind_arrow(EditLine *);
+libedit_private void terminal_print_arrow(EditLine *, const wchar_t *);
+libedit_private int terminal_clear_arrow(EditLine *, const wchar_t *);
+libedit_private int terminal_set_arrow(EditLine *, const wchar_t *,
keymacro_value_t *, int);
-protected void terminal_end(EditLine *);
-protected void terminal_get(EditLine *, const char **);
-protected int terminal_set(EditLine *, const char *);
-protected int terminal_settc(EditLine *, int, const wchar_t **);
-protected int terminal_gettc(EditLine *, int, char **);
-protected int terminal_telltc(EditLine *, int, const wchar_t **);
-protected int terminal_echotc(EditLine *, int, const wchar_t **);
-protected void terminal_writec(EditLine *, wint_t);
-protected int terminal__putc(EditLine *, wint_t);
-protected void terminal__flush(EditLine *);
+libedit_private void terminal_end(EditLine *);
+libedit_private void terminal_get(EditLine *, const char **);
+libedit_private int terminal_set(EditLine *, const char *);
+libedit_private int terminal_settc(EditLine *, int, const wchar_t **);
+libedit_private int terminal_gettc(EditLine *, int, char **);
+libedit_private int terminal_telltc(EditLine *, int, const wchar_t **);
+libedit_private int terminal_echotc(EditLine *, int, const wchar_t **);
+libedit_private void terminal_writec(EditLine *, wint_t);
+libedit_private int terminal__putc(EditLine *, wint_t);
+libedit_private void terminal__flush(EditLine *);
/*
* Easy access macros
Index: src/lib/libedit/prompt.c
diff -u src/lib/libedit/prompt.c:1.25 src/lib/libedit/prompt.c:1.26
--- src/lib/libedit/prompt.c:1.25 Mon Apr 11 14:56:31 2016
+++ src/lib/libedit/prompt.c Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: prompt.c,v 1.25 2016/04/11 18:56:31 christos Exp $ */
+/* $NetBSD: prompt.c,v 1.26 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)prompt.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: prompt.c,v 1.25 2016/04/11 18:56:31 christos Exp $");
+__RCSID("$NetBSD: prompt.c,v 1.26 2016/05/09 21:46:56 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -79,7 +79,7 @@ prompt_default_r(EditLine *el __attribut
/* prompt_print():
* Print the prompt and update the prompt position.
*/
-protected void
+libedit_private void
prompt_print(EditLine *el, int op)
{
el_prompt_t *elp;
@@ -116,7 +116,7 @@ prompt_print(EditLine *el, int op)
/* prompt_init():
* Initialize the prompt stuff
*/
-protected int
+libedit_private int
prompt_init(EditLine *el)
{
@@ -135,7 +135,7 @@ prompt_init(EditLine *el)
/* prompt_end():
* Clean up the prompt stuff
*/
-protected void
+libedit_private void
/*ARGSUSED*/
prompt_end(EditLine *el __attribute__((__unused__)))
{
@@ -145,7 +145,7 @@ prompt_end(EditLine *el __attribute__((_
/* prompt_set():
* Install a prompt printing function
*/
-protected int
+libedit_private int
prompt_set(EditLine *el, el_pfunc_t prf, wchar_t c, int op, int wide)
{
el_prompt_t *p;
@@ -177,7 +177,7 @@ prompt_set(EditLine *el, el_pfunc_t prf,
/* prompt_get():
* Retrieve the prompt printing function
*/
-protected int
+libedit_private int
prompt_get(EditLine *el, el_pfunc_t *prf, wchar_t *c, int op)
{
el_prompt_t *p;
Index: src/lib/libedit/sig.c
diff -u src/lib/libedit/sig.c:1.25 src/lib/libedit/sig.c:1.26
--- src/lib/libedit/sig.c:1.25 Mon Apr 11 14:56:31 2016
+++ src/lib/libedit/sig.c Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sig.c,v 1.25 2016/04/11 18:56:31 christos Exp $ */
+/* $NetBSD: sig.c,v 1.26 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)sig.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: sig.c,v 1.25 2016/04/11 18:56:31 christos Exp $");
+__RCSID("$NetBSD: sig.c,v 1.26 2016/05/09 21:46:56 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -115,7 +115,7 @@ sig_handler(int signo)
/* sig_init():
* Initialize all signal stuff
*/
-protected int
+libedit_private int
sig_init(EditLine *el)
{
size_t i;
@@ -147,7 +147,7 @@ sig_init(EditLine *el)
/* sig_end():
* Clear all signal stuff
*/
-protected void
+libedit_private void
sig_end(EditLine *el)
{
@@ -159,7 +159,7 @@ sig_end(EditLine *el)
/* sig_set():
* set all the signal handlers
*/
-protected void
+libedit_private void
sig_set(EditLine *el)
{
size_t i;
@@ -186,7 +186,7 @@ sig_set(EditLine *el)
/* sig_clr():
* clear all the signal handlers
*/
-protected void
+libedit_private void
sig_clr(EditLine *el)
{
size_t i;
Index: src/lib/libedit/prompt.h
diff -u src/lib/libedit/prompt.h:1.14 src/lib/libedit/prompt.h:1.15
--- src/lib/libedit/prompt.h:1.14 Sun Apr 10 20:50:13 2016
+++ src/lib/libedit/prompt.h Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: prompt.h,v 1.14 2016/04/11 00:50:13 christos Exp $ */
+/* $NetBSD: prompt.h,v 1.15 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -49,10 +49,10 @@ typedef struct el_prompt_t {
int p_wide;
} el_prompt_t;
-protected void prompt_print(EditLine *, int);
-protected int prompt_set(EditLine *, el_pfunc_t, wchar_t, int, int);
-protected int prompt_get(EditLine *, el_pfunc_t *, wchar_t *, int);
-protected int prompt_init(EditLine *);
-protected void prompt_end(EditLine *);
+libedit_private void prompt_print(EditLine *, int);
+libedit_private int prompt_set(EditLine *, el_pfunc_t, wchar_t, int, int);
+libedit_private int prompt_get(EditLine *, el_pfunc_t *, wchar_t *, int);
+libedit_private int prompt_init(EditLine *);
+libedit_private void prompt_end(EditLine *);
#endif /* _h_el_prompt */
Index: src/lib/libedit/read.c
diff -u src/lib/libedit/read.c:1.95 src/lib/libedit/read.c:1.96
--- src/lib/libedit/read.c:1.95 Tue Apr 19 15:50:53 2016
+++ src/lib/libedit/read.c Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: read.c,v 1.95 2016/04/19 19:50:53 christos Exp $ */
+/* $NetBSD: read.c,v 1.96 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)read.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: read.c,v 1.95 2016/04/19 19:50:53 christos Exp $");
+__RCSID("$NetBSD: read.c,v 1.96 2016/05/09 21:46:56 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -69,7 +69,7 @@ static void read_pop(c_macro_t *);
/* read_init():
* Initialize the read stuff
*/
-protected int
+libedit_private int
read_init(EditLine *el)
{
if ((el->el_read = el_malloc(sizeof(*el->el_read))) == NULL)
@@ -84,7 +84,7 @@ read_init(EditLine *el)
* Set the read char function to the one provided.
* If it is set to EL_BUILTIN_GETCFN, then reset to the builtin one.
*/
-protected int
+libedit_private int
el_read_setfn(struct el_read_t *el_read, el_rfunc_t rc)
{
el_read->read_char = (rc == EL_BUILTIN_GETCFN) ? read_char : rc;
@@ -96,7 +96,7 @@ el_read_setfn(struct el_read_t *el_read,
* return the current read char function, or EL_BUILTIN_GETCFN
* if it is the default one
*/
-protected el_rfunc_t
+libedit_private el_rfunc_t
el_read_getfn(struct el_read_t *el_read)
{
return el_read->read_char == read_char ?
@@ -406,7 +406,7 @@ el_wgetc(EditLine *el, wchar_t *cp)
return num_read;
}
-protected void
+libedit_private void
read_prepare(EditLine *el)
{
if (el->el_flags & HANDLE_SIGNALS)
@@ -427,7 +427,7 @@ read_prepare(EditLine *el)
terminal__flush(el);
}
-protected void
+libedit_private void
read_finish(EditLine *el)
{
if ((el->el_flags & UNBUFFERED) == 0)
Index: src/lib/libedit/read.h
diff -u src/lib/libedit/read.h:1.10 src/lib/libedit/read.h:1.11
--- src/lib/libedit/read.h:1.10 Tue Apr 19 15:50:53 2016
+++ src/lib/libedit/read.h Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: read.h,v 1.10 2016/04/19 19:50:53 christos Exp $ */
+/* $NetBSD: read.h,v 1.11 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,10 +35,10 @@
#ifndef _h_el_read
#define _h_el_read
-protected int read_init(EditLine *);
-protected void read_prepare(EditLine *);
-protected void read_finish(EditLine *);
-protected int el_read_setfn(struct el_read_t *, el_rfunc_t);
-protected el_rfunc_t el_read_getfn(struct el_read_t *);
+libedit_private int read_init(EditLine *);
+libedit_private void read_prepare(EditLine *);
+libedit_private void read_finish(EditLine *);
+libedit_private int el_read_setfn(struct el_read_t *, el_rfunc_t);
+libedit_private el_rfunc_t el_read_getfn(struct el_read_t *);
#endif /* _h_el_read */
Index: src/lib/libedit/sig.h
diff -u src/lib/libedit/sig.h:1.10 src/lib/libedit/sig.h:1.11
--- src/lib/libedit/sig.h:1.10 Tue Feb 16 10:53:48 2016
+++ src/lib/libedit/sig.h Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sig.h,v 1.10 2016/02/16 15:53:48 christos Exp $ */
+/* $NetBSD: sig.h,v 1.11 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -62,9 +62,9 @@ typedef struct {
volatile sig_atomic_t sig_no;
} *el_signal_t;
-protected void sig_end(EditLine*);
-protected int sig_init(EditLine*);
-protected void sig_set(EditLine*);
-protected void sig_clr(EditLine*);
+libedit_private void sig_end(EditLine*);
+libedit_private int sig_init(EditLine*);
+libedit_private void sig_set(EditLine*);
+libedit_private void sig_clr(EditLine*);
#endif /* _h_el_sig */
Index: src/lib/libedit/refresh.h
diff -u src/lib/libedit/refresh.h:1.9 src/lib/libedit/refresh.h:1.10
--- src/lib/libedit/refresh.h:1.9 Tue Feb 16 10:53:48 2016
+++ src/lib/libedit/refresh.h Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: refresh.h,v 1.9 2016/02/16 15:53:48 christos Exp $ */
+/* $NetBSD: refresh.h,v 1.10 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -46,12 +46,12 @@ typedef struct {
int r_newcv;
} el_refresh_t;
-protected void re_putc(EditLine *, wint_t, int);
-protected void re_clear_lines(EditLine *);
-protected void re_clear_display(EditLine *);
-protected void re_refresh(EditLine *);
-protected void re_refresh_cursor(EditLine *);
-protected void re_fastaddc(EditLine *);
-protected void re_goto_bottom(EditLine *);
+libedit_private void re_putc(EditLine *, wint_t, int);
+libedit_private void re_clear_lines(EditLine *);
+libedit_private void re_clear_display(EditLine *);
+libedit_private void re_refresh(EditLine *);
+libedit_private void re_refresh_cursor(EditLine *);
+libedit_private void re_fastaddc(EditLine *);
+libedit_private void re_goto_bottom(EditLine *);
#endif /* _h_el_refresh */
Index: src/lib/libedit/search.c
diff -u src/lib/libedit/search.c:1.46 src/lib/libedit/search.c:1.47
--- src/lib/libedit/search.c:1.46 Thu Apr 28 08:27:45 2016
+++ src/lib/libedit/search.c Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: search.c,v 1.46 2016/04/28 12:27:45 christos Exp $ */
+/* $NetBSD: search.c,v 1.47 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)search.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: search.c,v 1.46 2016/04/28 12:27:45 christos Exp $");
+__RCSID("$NetBSD: search.c,v 1.47 2016/05/09 21:46:56 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -66,7 +66,7 @@ __RCSID("$NetBSD: search.c,v 1.46 2016/0
/* search_init():
* Initialize the search stuff
*/
-protected int
+libedit_private int
search_init(EditLine *el)
{
@@ -87,7 +87,7 @@ search_init(EditLine *el)
/* search_end():
* Initialize the search stuff
*/
-protected void
+libedit_private void
search_end(EditLine *el)
{
@@ -111,7 +111,7 @@ regerror(const char *msg)
/* el_match():
* Return if string matches pattern
*/
-protected int
+libedit_private int
el_match(const wchar_t *str, const wchar_t *pat)
{
static ct_buffer_t conv;
@@ -158,7 +158,7 @@ el_match(const wchar_t *str, const wchar
/* c_hmatch():
* return True if the pattern matches the prefix
*/
-protected int
+libedit_private int
c_hmatch(EditLine *el, const wchar_t *str)
{
#ifdef SDEBUG
@@ -173,7 +173,7 @@ c_hmatch(EditLine *el, const wchar_t *st
/* c_setpat():
* Set the history seatch pattern
*/
-protected void
+libedit_private void
c_setpat(EditLine *el)
{
if (el->el_state.lastcmd != ED_SEARCH_PREV_HISTORY &&
@@ -205,7 +205,7 @@ c_setpat(EditLine *el)
/* ce_inc_search():
* Emacs incremental search
*/
-protected el_action_t
+libedit_private el_action_t
ce_inc_search(EditLine *el, int dir)
{
static const wchar_t STRfwd[] = L"fwd", STRbck[] = L"bck";
@@ -452,7 +452,7 @@ ce_inc_search(EditLine *el, int dir)
/* cv_search():
* Vi search.
*/
-protected el_action_t
+libedit_private el_action_t
cv_search(EditLine *el, int dir)
{
wchar_t ch;
@@ -526,7 +526,7 @@ cv_search(EditLine *el, int dir)
/* ce_search_line():
* Look for a pattern inside a line
*/
-protected el_action_t
+libedit_private el_action_t
ce_search_line(EditLine *el, int dir)
{
wchar_t *cp = el->el_line.cursor;
@@ -568,7 +568,7 @@ ce_search_line(EditLine *el, int dir)
/* cv_repeat_srch():
* Vi repeat search
*/
-protected el_action_t
+libedit_private el_action_t
cv_repeat_srch(EditLine *el, wint_t c)
{
@@ -594,7 +594,7 @@ cv_repeat_srch(EditLine *el, wint_t c)
/* cv_csearch():
* Vi character search
*/
-protected el_action_t
+libedit_private el_action_t
cv_csearch(EditLine *el, int direction, wint_t ch, int count, int tflag)
{
wchar_t *cp;
Index: src/lib/libedit/search.h
diff -u src/lib/libedit/search.h:1.13 src/lib/libedit/search.h:1.14
--- src/lib/libedit/search.h:1.13 Sun Apr 10 20:50:13 2016
+++ src/lib/libedit/search.h Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: search.h,v 1.13 2016/04/11 00:50:13 christos Exp $ */
+/* $NetBSD: search.h,v 1.14 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -50,15 +50,15 @@ typedef struct el_search_t {
} el_search_t;
-protected int el_match(const wchar_t *, const wchar_t *);
-protected int search_init(EditLine *);
-protected void search_end(EditLine *);
-protected int c_hmatch(EditLine *, const wchar_t *);
-protected void c_setpat(EditLine *);
-protected el_action_t ce_inc_search(EditLine *, int);
-protected el_action_t cv_search(EditLine *, int);
-protected el_action_t ce_search_line(EditLine *, int);
-protected el_action_t cv_repeat_srch(EditLine *, wint_t);
-protected el_action_t cv_csearch(EditLine *, int, wint_t, int, int);
+libedit_private int el_match(const wchar_t *, const wchar_t *);
+libedit_private int search_init(EditLine *);
+libedit_private void search_end(EditLine *);
+libedit_private int c_hmatch(EditLine *, const wchar_t *);
+libedit_private void c_setpat(EditLine *);
+libedit_private el_action_t ce_inc_search(EditLine *, int);
+libedit_private el_action_t cv_search(EditLine *, int);
+libedit_private el_action_t ce_search_line(EditLine *, int);
+libedit_private el_action_t cv_repeat_srch(EditLine *, wint_t);
+libedit_private el_action_t cv_csearch(EditLine *, int, wint_t, int, int);
#endif /* _h_el_search */
Index: src/lib/libedit/sys.h
diff -u src/lib/libedit/sys.h:1.26 src/lib/libedit/sys.h:1.27
--- src/lib/libedit/sys.h:1.26 Mon May 9 17:38:27 2016
+++ src/lib/libedit/sys.h Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sys.h,v 1.26 2016/05/09 21:38:27 christos Exp $ */
+/* $NetBSD: sys.h,v 1.27 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -59,7 +59,7 @@
#endif
/* If your compiler does not support this, define it to be empty. */
-#define protected __attribute__((__visibility__("hidden")))
+#define libedit_private __attribute__((__visibility__("hidden")))
#ifndef __arraycount
# define __arraycount(a) (sizeof(a) / sizeof(*(a)))
Index: src/lib/libedit/terminal.c
diff -u src/lib/libedit/terminal.c:1.31 src/lib/libedit/terminal.c:1.32
--- src/lib/libedit/terminal.c:1.31 Mon May 2 12:48:34 2016
+++ src/lib/libedit/terminal.c Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: terminal.c,v 1.31 2016/05/02 16:48:34 christos Exp $ */
+/* $NetBSD: terminal.c,v 1.32 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)term.c 8.2 (Berkeley) 4/30/95";
#else
-__RCSID("$NetBSD: terminal.c,v 1.31 2016/05/02 16:48:34 christos Exp $");
+__RCSID("$NetBSD: terminal.c,v 1.32 2016/05/09 21:46:56 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -265,7 +265,7 @@ terminal_setflags(EditLine *el)
/* terminal_init():
* Initialize the terminal stuff
*/
-protected int
+libedit_private int
terminal_init(EditLine *el)
{
@@ -316,7 +316,7 @@ fail1:
/* terminal_end():
* Clean up the terminal stuff
*/
-protected void
+libedit_private void
terminal_end(EditLine *el)
{
@@ -496,7 +496,7 @@ terminal_free_display(EditLine *el)
* move to line <where> (first line == 0)
* as efficiently as possible
*/
-protected void
+libedit_private void
terminal_move_to_line(EditLine *el, int where)
{
int del;
@@ -559,7 +559,7 @@ terminal_move_to_line(EditLine *el, int
/* terminal_move_to_char():
* Move to the character position specified
*/
-protected void
+libedit_private void
terminal_move_to_char(EditLine *el, int where)
{
int del, i;
@@ -654,7 +654,7 @@ mc_again:
* Overstrike num characters
* Assumes MB_FILL_CHARs are present to keep the column count correct
*/
-protected void
+libedit_private void
terminal_overwrite(EditLine *el, const wchar_t *cp, size_t n)
{
if (n == 0)
@@ -702,7 +702,7 @@ terminal_overwrite(EditLine *el, const w
/* terminal_deletechars():
* Delete num characters
*/
-protected void
+libedit_private void
terminal_deletechars(EditLine *el, int num)
{
if (num <= 0)
@@ -744,7 +744,7 @@ terminal_deletechars(EditLine *el, int n
* characters in the line
* Assumes MB_FILL_CHARs are present to keep column count correct
*/
-protected void
+libedit_private void
terminal_insertwrite(EditLine *el, wchar_t *cp, int num)
{
if (num <= 0)
@@ -803,7 +803,7 @@ terminal_insertwrite(EditLine *el, wchar
/* terminal_clear_EOL():
* clear to end of line. There are num characters to clear
*/
-protected void
+libedit_private void
terminal_clear_EOL(EditLine *el, int num)
{
int i;
@@ -821,7 +821,7 @@ terminal_clear_EOL(EditLine *el, int num
/* terminal_clear_screen():
* Clear the screen
*/
-protected void
+libedit_private void
terminal_clear_screen(EditLine *el)
{ /* clear the whole screen and home */
@@ -842,7 +842,7 @@ terminal_clear_screen(EditLine *el)
/* terminal_beep():
* Beep the way the terminal wants us
*/
-protected void
+libedit_private void
terminal_beep(EditLine *el)
{
if (GoodStr(T_bl))
@@ -853,7 +853,7 @@ terminal_beep(EditLine *el)
}
-protected void
+libedit_private void
terminal_get(EditLine *el, const char **term)
{
*term = el->el_terminal.t_name;
@@ -863,7 +863,7 @@ terminal_get(EditLine *el, const char **
/* terminal_set():
* Read in the terminal capabilities from the requested terminal
*/
-protected int
+libedit_private int
terminal_set(EditLine *el, const char *term)
{
int i;
@@ -952,7 +952,7 @@ terminal_set(EditLine *el, const char *t
* Return the new window size in lines and cols, and
* true if the size was changed.
*/
-protected int
+libedit_private int
terminal_get_size(EditLine *el, int *lins, int *cols)
{
@@ -988,7 +988,7 @@ terminal_get_size(EditLine *el, int *lin
/* terminal_change_size():
* Change the size of the terminal
*/
-protected int
+libedit_private int
terminal_change_size(EditLine *el, int lins, int cols)
{
/*
@@ -1103,7 +1103,7 @@ terminal_reset_arrow(EditLine *el)
/* terminal_set_arrow():
* Set an arrow key binding
*/
-protected int
+libedit_private int
terminal_set_arrow(EditLine *el, const wchar_t *name, keymacro_value_t *fun,
int type)
{
@@ -1123,7 +1123,7 @@ terminal_set_arrow(EditLine *el, const w
/* terminal_clear_arrow():
* Clear an arrow key binding
*/
-protected int
+libedit_private int
terminal_clear_arrow(EditLine *el, const wchar_t *name)
{
funckey_t *arrow = el->el_terminal.t_fkey;
@@ -1141,7 +1141,7 @@ terminal_clear_arrow(EditLine *el, const
/* terminal_print_arrow():
* Print the arrow key bindings
*/
-protected void
+libedit_private void
terminal_print_arrow(EditLine *el, const wchar_t *name)
{
int i;
@@ -1158,7 +1158,7 @@ terminal_print_arrow(EditLine *el, const
/* terminal_bind_arrow():
* Bind the arrow keys
*/
-protected void
+libedit_private void
terminal_bind_arrow(EditLine *el)
{
el_action_t *map;
@@ -1247,7 +1247,7 @@ terminal_tputs(EditLine *el, const char
/* terminal__putc():
* Add a character
*/
-protected int
+libedit_private int
terminal__putc(EditLine *el, wint_t c)
{
char buf[MB_LEN_MAX +1];
@@ -1264,7 +1264,7 @@ terminal__putc(EditLine *el, wint_t c)
/* terminal__flush():
* Flush output
*/
-protected void
+libedit_private void
terminal__flush(EditLine *el)
{
@@ -1274,7 +1274,7 @@ terminal__flush(EditLine *el)
/* terminal_writec():
* Write the given character out, in a human readable form
*/
-protected void
+libedit_private void
terminal_writec(EditLine *el, wint_t c)
{
wchar_t visbuf[VISUAL_WIDTH_MAX +1];
@@ -1290,7 +1290,7 @@ terminal_writec(EditLine *el, wint_t c)
/* terminal_telltc():
* Print the current termcap characteristics
*/
-protected int
+libedit_private int
/*ARGSUSED*/
terminal_telltc(EditLine *el, int argc __attribute__((__unused__)),
const wchar_t **argv __attribute__((__unused__)))
@@ -1332,7 +1332,7 @@ terminal_telltc(EditLine *el, int argc _
/* terminal_settc():
* Change the current terminal characteristics
*/
-protected int
+libedit_private int
/*ARGSUSED*/
terminal_settc(EditLine *el, int argc __attribute__((__unused__)),
const wchar_t **argv)
@@ -1411,7 +1411,7 @@ terminal_settc(EditLine *el, int argc __
/* terminal_gettc():
* Get the current terminal characteristics
*/
-protected int
+libedit_private int
/*ARGSUSED*/
terminal_gettc(EditLine *el, int argc __attribute__((__unused__)), char **argv)
{
@@ -1465,7 +1465,7 @@ terminal_gettc(EditLine *el, int argc __
/* terminal_echotc():
* Print the termcap string out with variable substitution
*/
-protected int
+libedit_private int
/*ARGSUSED*/
terminal_echotc(EditLine *el, int argc __attribute__((__unused__)),
const wchar_t **argv)
Index: src/lib/libedit/tty.c
diff -u src/lib/libedit/tty.c:1.64 src/lib/libedit/tty.c:1.65
--- src/lib/libedit/tty.c:1.64 Mon Apr 18 13:01:19 2016
+++ src/lib/libedit/tty.c Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.64 2016/04/18 17:01:19 christos Exp $ */
+/* $NetBSD: tty.c,v 1.65 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)tty.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: tty.c,v 1.64 2016/04/18 17:01:19 christos Exp $");
+__RCSID("$NetBSD: tty.c,v 1.65 2016/05/09 21:46:56 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -568,7 +568,7 @@ tty_setup(EditLine *el)
return 0;
}
-protected int
+libedit_private int
tty_init(EditLine *el)
{
@@ -584,7 +584,7 @@ tty_init(EditLine *el)
/* tty_end():
* Restore the tty to its original settings
*/
-protected void
+libedit_private void
/*ARGSUSED*/
tty_end(EditLine *el)
{
@@ -891,7 +891,7 @@ tty__setchar(struct termios *td, unsigne
/* tty_bind_char():
* Rebind the editline functions
*/
-protected void
+libedit_private void
tty_bind_char(EditLine *el, int force)
{
@@ -991,7 +991,7 @@ tty_update_char(EditLine *el, int mode,
/* tty_rawmode():
* Set terminal into 1 character at a time mode.
*/
-protected int
+libedit_private int
tty_rawmode(EditLine *el)
{
@@ -1046,7 +1046,7 @@ tty_rawmode(EditLine *el)
if (i != C_NCC) {
/*
- * Propagate changes only to the unprotected
+ * Propagate changes only to the unlibedit_private
* chars that have been modified just now.
*/
for (i = 0; i < C_NCC; i++)
@@ -1076,7 +1076,7 @@ tty_rawmode(EditLine *el)
/* tty_cookedmode():
* Set the tty back to normal mode
*/
-protected int
+libedit_private int
tty_cookedmode(EditLine *el)
{ /* set tty in normal setup */
@@ -1101,7 +1101,7 @@ tty_cookedmode(EditLine *el)
/* tty_quotemode():
* Turn on quote mode
*/
-protected int
+libedit_private int
tty_quotemode(EditLine *el)
{
if (el->el_tty.t_mode == QU_IO)
@@ -1126,7 +1126,7 @@ tty_quotemode(EditLine *el)
/* tty_noquotemode():
* Turn off quote mode
*/
-protected int
+libedit_private int
tty_noquotemode(EditLine *el)
{
@@ -1147,7 +1147,7 @@ tty_noquotemode(EditLine *el)
/* tty_stty():
* Stty builtin
*/
-protected int
+libedit_private int
/*ARGSUSED*/
tty_stty(EditLine *el, int argc __attribute__((__unused__)),
const wchar_t **argv)
Index: src/lib/libedit/tty.h
diff -u src/lib/libedit/tty.h:1.20 src/lib/libedit/tty.h:1.21
--- src/lib/libedit/tty.h:1.20 Sun Apr 10 20:50:13 2016
+++ src/lib/libedit/tty.h Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.h,v 1.20 2016/04/11 00:50:13 christos Exp $ */
+/* $NetBSD: tty.h,v 1.21 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -456,14 +456,14 @@ typedef struct {
typedef unsigned char ttychar_t[NN_IO][C_NCC];
-protected int tty_init(EditLine *);
-protected void tty_end(EditLine *);
-protected int tty_stty(EditLine *, int, const wchar_t **);
-protected int tty_rawmode(EditLine *);
-protected int tty_cookedmode(EditLine *);
-protected int tty_quotemode(EditLine *);
-protected int tty_noquotemode(EditLine *);
-protected void tty_bind_char(EditLine *, int);
+libedit_private int tty_init(EditLine *);
+libedit_private void tty_end(EditLine *);
+libedit_private int tty_stty(EditLine *, int, const wchar_t **);
+libedit_private int tty_rawmode(EditLine *);
+libedit_private int tty_cookedmode(EditLine *);
+libedit_private int tty_quotemode(EditLine *);
+libedit_private int tty_noquotemode(EditLine *);
+libedit_private void tty_bind_char(EditLine *, int);
typedef struct {
ttyperm_t t_t;
Index: src/lib/libedit/vi.c
diff -u src/lib/libedit/vi.c:1.61 src/lib/libedit/vi.c:1.62
--- src/lib/libedit/vi.c:1.61 Mon Apr 18 13:01:19 2016
+++ src/lib/libedit/vi.c Mon May 9 17:46:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: vi.c,v 1.61 2016/04/18 17:01:19 christos Exp $ */
+/* $NetBSD: vi.c,v 1.62 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)vi.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: vi.c,v 1.61 2016/04/18 17:01:19 christos Exp $");
+__RCSID("$NetBSD: vi.c,v 1.62 2016/05/09 21:46:56 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -127,7 +127,7 @@ cv_paste(EditLine *el, wint_t c)
* Vi paste previous deletion to the right of the cursor
* [p]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_paste_next(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -140,7 +140,7 @@ vi_paste_next(EditLine *el, wint_t c __a
* Vi paste previous deletion to the left of the cursor
* [P]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_paste_prev(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -153,7 +153,7 @@ vi_paste_prev(EditLine *el, wint_t c __a
* Vi move to the previous space delimited word
* [B]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_prev_big_word(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -178,7 +178,7 @@ vi_prev_big_word(EditLine *el, wint_t c
* Vi move to the previous word
* [b]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_prev_word(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -203,7 +203,7 @@ vi_prev_word(EditLine *el, wint_t c __at
* Vi move to the next space delimited word
* [W]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_next_big_word(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -227,7 +227,7 @@ vi_next_big_word(EditLine *el, wint_t c
* Vi move to the next word
* [w]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_next_word(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -251,7 +251,7 @@ vi_next_word(EditLine *el, wint_t c __at
* Vi change case of character under the cursor and advance one character
* [~]
*/
-protected el_action_t
+libedit_private el_action_t
vi_change_case(EditLine *el, wint_t c)
{
int i;
@@ -282,7 +282,7 @@ vi_change_case(EditLine *el, wint_t c)
* Vi change prefix command
* [c]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_change_meta(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -299,7 +299,7 @@ vi_change_meta(EditLine *el, wint_t c __
* Vi enter insert mode at the beginning of line
* [I]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_insert_at_bol(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -315,7 +315,7 @@ vi_insert_at_bol(EditLine *el, wint_t c
* Vi replace character under the cursor with the next character typed
* [r]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_replace_char(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -334,7 +334,7 @@ vi_replace_char(EditLine *el, wint_t c _
* Vi enter replace mode
* [R]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_replace_mode(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -350,7 +350,7 @@ vi_replace_mode(EditLine *el, wint_t c _
* Vi replace character under the cursor and enter insert mode
* [s]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_substitute_char(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -365,7 +365,7 @@ vi_substitute_char(EditLine *el, wint_t
* Vi substitute entire line
* [S]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_substitute_line(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -383,7 +383,7 @@ vi_substitute_line(EditLine *el, wint_t
* Vi change to end of line
* [C]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_change_to_eol(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -401,7 +401,7 @@ vi_change_to_eol(EditLine *el, wint_t c
* Vi enter insert mode
* [i]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_insert(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -416,7 +416,7 @@ vi_insert(EditLine *el, wint_t c __attri
* Vi enter insert mode after the cursor
* [a]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_add(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -441,7 +441,7 @@ vi_add(EditLine *el, wint_t c __attribut
* Vi enter insert mode at end of line
* [A]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_add_at_eol(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -457,7 +457,7 @@ vi_add_at_eol(EditLine *el, wint_t c __a
* Vi delete prefix command
* [d]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_delete_meta(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -470,7 +470,7 @@ vi_delete_meta(EditLine *el, wint_t c __
* Vi move to the end of the current space delimited word
* [E]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_end_big_word(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -494,7 +494,7 @@ vi_end_big_word(EditLine *el, wint_t c _
* Vi move to the end of the current word
* [e]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_end_word(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -518,7 +518,7 @@ vi_end_word(EditLine *el, wint_t c __att
* Vi undo last change
* [u]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_undo(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -545,7 +545,7 @@ vi_undo(EditLine *el, wint_t c __attribu
* Vi enter command mode (use alternative key bindings)
* [<ESC>]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_command_mode(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -570,7 +570,7 @@ vi_command_mode(EditLine *el, wint_t c _
* Vi move to the beginning of line
* [0]
*/
-protected el_action_t
+libedit_private el_action_t
vi_zero(EditLine *el, wint_t c)
{
@@ -590,7 +590,7 @@ vi_zero(EditLine *el, wint_t c)
* Vi move to previous character (backspace)
* [^H] in insert mode only
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_delete_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -608,7 +608,7 @@ vi_delete_prev_char(EditLine *el, wint_t
* Vi list choices for completion or indicate end of file if empty line
* [^D]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_list_or_eof(EditLine *el, wint_t c)
{
@@ -645,7 +645,7 @@ vi_list_or_eof(EditLine *el, wint_t c)
* Vi cut from beginning of line to cursor
* [^U]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_kill_line_prev(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -666,7 +666,7 @@ vi_kill_line_prev(EditLine *el, wint_t c
* Vi search history previous
* [?]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_search_prev(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -679,7 +679,7 @@ vi_search_prev(EditLine *el, wint_t c __
* Vi search history next
* [/]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_search_next(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -692,7 +692,7 @@ vi_search_next(EditLine *el, wint_t c __
* Vi repeat current search in the same search direction
* [n]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_repeat_search_next(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -709,7 +709,7 @@ vi_repeat_search_next(EditLine *el, wint
* [N]
*/
/*ARGSUSED*/
-protected el_action_t
+libedit_private el_action_t
vi_repeat_search_prev(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -726,7 +726,7 @@ vi_repeat_search_prev(EditLine *el, wint
* Vi move to the character specified next
* [f]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_next_char(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -738,7 +738,7 @@ vi_next_char(EditLine *el, wint_t c __at
* Vi move to the character specified previous
* [F]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -750,7 +750,7 @@ vi_prev_char(EditLine *el, wint_t c __at
* Vi move up to the character specified next
* [t]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_to_next_char(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -762,7 +762,7 @@ vi_to_next_char(EditLine *el, wint_t c _
* Vi move up to the character specified previous
* [T]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_to_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -774,7 +774,7 @@ vi_to_prev_char(EditLine *el, wint_t c _
* Vi repeat current character search in the same search direction
* [;]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_repeat_next_char(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -788,7 +788,7 @@ vi_repeat_next_char(EditLine *el, wint_t
* Vi repeat current character search in the opposite search direction
* [,]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_repeat_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -806,7 +806,7 @@ vi_repeat_prev_char(EditLine *el, wint_t
* Vi go to matching () {} or []
* [%]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_match(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -853,7 +853,7 @@ vi_match(EditLine *el, wint_t c __attrib
* Vi undo all changes to line
* [U]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_undo_line(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -867,7 +867,7 @@ vi_undo_line(EditLine *el, wint_t c __at
* [|]
* NB netbsd vi goes to screen column 'n', posix says nth character
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_to_column(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -881,7 +881,7 @@ vi_to_column(EditLine *el, wint_t c __at
* Vi yank to end of line
* [Y]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_yank_end(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -895,7 +895,7 @@ vi_yank_end(EditLine *el, wint_t c __att
* Vi yank
* [y]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_yank(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -907,7 +907,7 @@ vi_yank(EditLine *el, wint_t c __attribu
* Vi comment out current command
* [#]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_comment_out(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -925,7 +925,7 @@ vi_comment_out(EditLine *el, wint_t c __
* NB: posix implies that we should enter insert mode, however
* this is against historical precedent...
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_alias(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -951,7 +951,7 @@ vi_alias(EditLine *el, wint_t c __attrib
* Vi go to specified history file line.
* [G]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_to_history_line(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -996,7 +996,7 @@ vi_to_history_line(EditLine *el, wint_t
* Vi edit history line with vi
* [v]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_histedit(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -1080,7 +1080,7 @@ error:
* Who knows where this one came from!
* '_' in vi means 'entire current line', so 'cc' is a synonym for 'c_'
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_history_word(EditLine *el, wint_t c __attribute__((__unused__)))
{
@@ -1130,7 +1130,7 @@ vi_history_word(EditLine *el, wint_t c _
* Vi redo last non-motion command
* [.]
*/
-protected el_action_t
+libedit_private el_action_t
/*ARGSUSED*/
vi_redo(EditLine *el, wint_t c __attribute__((__unused__)))
{
