diff options
Diffstat (limited to 'lib/libedit/keymacro.c')
| -rw-r--r-- | lib/libedit/keymacro.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/lib/libedit/keymacro.c b/lib/libedit/keymacro.c index dc2137aa1a7..97de3a72a7e 100644 --- a/lib/libedit/keymacro.c +++ b/lib/libedit/keymacro.c @@ -1,5 +1,5 @@ -/* $OpenBSD: keymacro.c,v 1.12 2016/04/11 20:43:33 schwarze Exp $ */ -/* $NetBSD: keymacro.c,v 1.18 2016/04/11 00:50:13 christos Exp $ */ +/* $OpenBSD: keymacro.c,v 1.13 2016/04/11 21:17:29 schwarze Exp $ */ +/* $NetBSD: keymacro.c,v 1.19 2016/04/11 18:56:31 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -75,18 +75,18 @@ struct keymacro_node_t { struct keymacro_node_t *sibling;/* ptr to another key with same prefix*/ }; -private int node_trav(EditLine *, keymacro_node_t *, wchar_t *, +static int node_trav(EditLine *, keymacro_node_t *, wchar_t *, keymacro_value_t *); -private int node__try(EditLine *, keymacro_node_t *, +static int node__try(EditLine *, keymacro_node_t *, const wchar_t *, keymacro_value_t *, int); -private keymacro_node_t *node__get(wint_t); -private void node__free(keymacro_node_t *); -private void node__put(EditLine *, keymacro_node_t *); -private int node__delete(EditLine *, keymacro_node_t **, +static keymacro_node_t *node__get(wint_t); +static void node__free(keymacro_node_t *); +static void node__put(EditLine *, keymacro_node_t *); +static int node__delete(EditLine *, keymacro_node_t **, const wchar_t *); -private int node_lookup(EditLine *, const wchar_t *, +static int node_lookup(EditLine *, const wchar_t *, keymacro_node_t *, size_t); -private int node_enum(EditLine *, keymacro_node_t *, size_t); +static int node_enum(EditLine *, keymacro_node_t *, size_t); #define KEY_BUFSIZ EL_BUFSIZ @@ -270,7 +270,7 @@ keymacro_print(EditLine *el, const wchar_t *key) * recursively traverses node in tree until match or mismatch is * found. May read in more characters. */ -private int +static int node_trav(EditLine *el, keymacro_node_t *ptr, wchar_t *ch, keymacro_value_t *val) { @@ -308,7 +308,7 @@ node_trav(EditLine *el, keymacro_node_t *ptr, wchar_t *ch, /* node__try(): * Find a node that matches *str or allocate a new one */ -private int +static int node__try(EditLine *el, keymacro_node_t *ptr, const wchar_t *str, keymacro_value_t *val, int ntype) { @@ -371,7 +371,7 @@ node__try(EditLine *el, keymacro_node_t *ptr, const wchar_t *str, /* node__delete(): * Delete node that matches str */ -private int +static int node__delete(EditLine *el, keymacro_node_t **inptr, const wchar_t *str) { keymacro_node_t *ptr; @@ -419,7 +419,7 @@ node__delete(EditLine *el, keymacro_node_t **inptr, const wchar_t *str) /* node__put(): * Puts a tree of nodes onto free list using free(3). */ -private void +static void node__put(EditLine *el, keymacro_node_t *ptr) { if (ptr == NULL) @@ -451,7 +451,7 @@ node__put(EditLine *el, keymacro_node_t *ptr) /* node__get(): * Returns pointer to a keymacro_node_t for ch. */ -private keymacro_node_t * +static keymacro_node_t * node__get(wint_t ch) { keymacro_node_t *ptr; @@ -467,7 +467,7 @@ node__get(wint_t ch) return ptr; } -private void +static void node__free(keymacro_node_t *k) { if (k == NULL) @@ -481,7 +481,7 @@ node__free(keymacro_node_t *k) * look for the str starting at node ptr. * Print if last node */ -private int +static int node_lookup(EditLine *el, const wchar_t *str, keymacro_node_t *ptr, size_t cnt) { @@ -533,7 +533,7 @@ node_lookup(EditLine *el, const wchar_t *str, keymacro_node_t *ptr, /* node_enum(): * Traverse the node printing the characters it is bound in buffer */ -private int +static int node_enum(EditLine *el, keymacro_node_t *ptr, size_t cnt) { ssize_t used; |