diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2011-01-03 23:32:04 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2011-01-03 23:32:04 +0000 |
| commit | a24b67fc5a750c6ea67e41a3b323eea8fa02a29e (patch) | |
| tree | 60b1c35099bd98efe960791620ba9c75571b9f7c | |
| parent | 521247bedb4756f08ba9fdcf2c073dc318e3dcc6 (diff) | |
Sync OpenBSD patchset 824:
Last few tables that should be const.
| -rw-r--r-- | input-keys.c | 14 | ||||
| -rw-r--r-- | key-string.c | 4 | ||||
| -rw-r--r-- | xterm-keys.c | 16 |
3 files changed, 17 insertions, 17 deletions
diff --git a/input-keys.c b/input-keys.c index c79bb85d..34296462 100644 --- a/input-keys.c +++ b/input-keys.c @@ -1,4 +1,4 @@ -/* $Id: input-keys.c,v 1.46 2010-12-30 22:27:38 tcunha Exp $ */ +/* $Id: input-keys.c,v 1.47 2011-01-03 23:32:04 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -39,7 +39,7 @@ struct input_key_ent { #define INPUTKEY_CURSOR 0x2 /* cursor key */ }; -struct input_key_ent input_keys[] = { +const struct input_key_ent input_keys[] = { /* Backspace key. */ { KEYC_BSPACE, "\177", 0 }, @@ -136,11 +136,11 @@ struct input_key_ent input_keys[] = { void input_key(struct window_pane *wp, int key) { - struct input_key_ent *ike; - u_int i; - size_t dlen; - char *out; - u_char ch; + const struct input_key_ent *ike; + u_int i; + size_t dlen; + char *out; + u_char ch; log_debug2("writing key 0x%x", key); diff --git a/key-string.c b/key-string.c index 63ab4c98..e218e15c 100644 --- a/key-string.c +++ b/key-string.c @@ -1,4 +1,4 @@ -/* $Id: key-string.c,v 1.34 2010-06-05 20:29:11 micahcowan Exp $ */ +/* $Id: key-string.c,v 1.35 2011-01-03 23:32:04 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -25,7 +25,7 @@ int key_string_search_table(const char *); int key_string_get_modifiers(const char **); -struct { +const struct { const char *string; int key; } key_string_table[] = { diff --git a/xterm-keys.c b/xterm-keys.c index 5ce08641..4bb2a4bb 100644 --- a/xterm-keys.c +++ b/xterm-keys.c @@ -1,4 +1,4 @@ -/* $Id: xterm-keys.c,v 1.7 2010-10-24 00:30:51 tcunha Exp $ */ +/* $Id: xterm-keys.c,v 1.8 2011-01-03 23:32:04 tcunha Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -48,7 +48,7 @@ struct xterm_keys_entry { const char *template; }; -struct xterm_keys_entry xterm_keys_table[] = { +const struct xterm_keys_entry xterm_keys_table[] = { { KEYC_F1, "\033[1;_P" }, { KEYC_F1, "\033O_P" }, { KEYC_F2, "\033[1;_Q" }, @@ -140,8 +140,8 @@ xterm_keys_modifiers(const char *template, const char *buf, size_t len) int xterm_keys_find(const char *buf, size_t len, size_t *size, int *key) { - struct xterm_keys_entry *entry; - u_int i; + const struct xterm_keys_entry *entry; + u_int i; for (i = 0; i < nitems(xterm_keys_table); i++) { entry = &xterm_keys_table[i]; @@ -162,10 +162,10 @@ xterm_keys_find(const char *buf, size_t len, size_t *size, int *key) char * xterm_keys_lookup(int key) { - struct xterm_keys_entry *entry; - u_int i; - int modifiers; - char *out; + const struct xterm_keys_entry *entry; + u_int i; + int modifiers; + char *out; modifiers = 1; if (key & KEYC_SHIFT) |