diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2010-06-30 00:05:36 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2010-06-30 00:05:36 +0000 |
| commit | 4e317cd7d599f8bfe9b7906ba2f75a82e29a5f7a (patch) | |
| tree | 7381b8c061e5ffffa2117ee119ec36681dde870f /lib/libedit/key.h | |
| parent | a6429617a1d028ff60e599bcc583a0b56c844d85 (diff) | |
Update libedit to bring it into sync with the latest version from NetBSD.
ok deraadt
Diffstat (limited to 'lib/libedit/key.h')
| -rw-r--r-- | lib/libedit/key.h | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/lib/libedit/key.h b/lib/libedit/key.h index 86584417253..b6a2780e689 100644 --- a/lib/libedit/key.h +++ b/lib/libedit/key.h @@ -1,5 +1,5 @@ -/* $OpenBSD: key.h,v 1.7 2003/10/31 08:42:24 otto Exp $ */ -/* $NetBSD: key.h,v 1.8 2003/08/07 16:44:32 agc Exp $ */ +/* $OpenBSD: key.h,v 1.8 2010/06/30 00:05:35 nicm Exp $ */ +/* $NetBSD: key.h,v 1.13 2009/12/30 22:37:40 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -43,13 +43,13 @@ typedef union key_value_t { el_action_t cmd; /* If it is a command the # */ - char *str; /* If it is a string... */ + Char *str; /* If it is a string... */ } key_value_t; typedef struct key_node_t key_node_t; typedef struct el_key_t { - char *buf; /* Key print buffer */ + Char *buf; /* Key print buffer */ key_node_t *map; /* Key map */ key_value_t val; /* Local conversion buffer */ } el_key_t; @@ -66,15 +66,16 @@ typedef struct el_key_t { protected int key_init(EditLine *); protected void key_end(EditLine *); protected key_value_t *key_map_cmd(EditLine *, int); -protected key_value_t *key_map_str(EditLine *, char *); +protected key_value_t *key_map_str(EditLine *, Char *); protected void key_reset(EditLine *); -protected int key_get(EditLine *, char *, key_value_t *); -protected void key_add(EditLine *, const char *, key_value_t *, int); -protected void key_clear(EditLine *, el_action_t *, const char *); -protected int key_delete(EditLine *, const char *); -protected void key_print(EditLine *, const char *); -protected void key_kprint(EditLine *, const char *, key_value_t *, +protected int key_get(EditLine *, Char *, key_value_t *); +protected void key_add(EditLine *, const Char *, key_value_t *, int); +protected void key_clear(EditLine *, el_action_t *, const Char *); +protected int key_delete(EditLine *, const Char *); +protected void key_print(EditLine *, const Char *); +protected void key_kprint(EditLine *, const Char *, key_value_t *, int); -protected char *key__decode_str(const char *, char *, const char *); +protected size_t key__decode_str(const Char *, char *, size_t, + const char *); #endif /* _h_el_key */ |