Update of /cvsroot/tmux/tmux
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv12738
Modified Files:
input-keys.c key-string.c xterm-keys.c
Log Message:
Sync OpenBSD patchset 824:
Last few tables that should be const.
Index: input-keys.c
===================================================================
RCS file: /cvsroot/tmux/tmux/input-keys.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- input-keys.c 30 Dec 2010 22:27:38 -0000 1.46
+++ input-keys.c 3 Jan 2011 23:32:04 -0000 1.47
@@ -39,7 +39,7 @@
#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 @@
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);
Index: key-string.c
===================================================================
RCS file: /cvsroot/tmux/tmux/key-string.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- key-string.c 5 Jun 2010 20:29:11 -0000 1.34
+++ key-string.c 3 Jan 2011 23:32:04 -0000 1.35
@@ -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[] = {
Index: xterm-keys.c
===================================================================
RCS file: /cvsroot/tmux/tmux/xterm-keys.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- xterm-keys.c 24 Oct 2010 00:30:51 -0000 1.7
+++ xterm-keys.c 3 Jan 2011 23:32:04 -0000 1.8
@@ -48,7 +48,7 @@
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 @@
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 @@
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)
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
