circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-04 18:08:48 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 823:

Browse Source 
Sprinkle a little more const.
This commit is contained in:
Tiago Cunha 2011-01-03 23:31:26 +00:00
parent 9ad028e8ee
commit 521247bedb
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mode-key.c
View File

@ -1,4 +1,4 @@
/* $Id: mode-key.c,v 1.46 2010-03-16 17:30:58 micahcowan Exp $ */ /* $Id: mode-key.c,v 1.47 2011-01-03 23:31:26 tcunha Exp $ */
/* /*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@ -40,7 +40,7 @@
*/ */
/* Edit keys command strings. */ /* Edit keys command strings. */
struct mode_key_cmdstr mode_key_cmdstr_edit[] = { const struct mode_key_cmdstr mode_key_cmdstr_edit[] = {
{ MODEKEYEDIT_BACKSPACE, "backspace" }, { MODEKEYEDIT_BACKSPACE, "backspace" },
{ MODEKEYEDIT_CANCEL, "cancel" }, { MODEKEYEDIT_CANCEL, "cancel" },
{ MODEKEYEDIT_COMPLETE, "complete" }, { MODEKEYEDIT_COMPLETE, "complete" },
@ -63,7 +63,7 @@ struct mode_key_cmdstr mode_key_cmdstr_edit[] = {
}; };
/* Choice keys command strings. */ /* Choice keys command strings. */
struct mode_key_cmdstr mode_key_cmdstr_choice[] = { const struct mode_key_cmdstr mode_key_cmdstr_choice[] = {
{ MODEKEYCHOICE_CANCEL, "cancel" }, { MODEKEYCHOICE_CANCEL, "cancel" },
{ MODEKEYCHOICE_CHOOSE, "choose" }, { MODEKEYCHOICE_CHOOSE, "choose" },
{ MODEKEYCHOICE_DOWN, "down" }, { MODEKEYCHOICE_DOWN, "down" },
@ -77,7 +77,7 @@ struct mode_key_cmdstr mode_key_cmdstr_choice[] = {
}; };
/* Copy keys command strings. */ /* Copy keys command strings. */
struct mode_key_cmdstr mode_key_cmdstr_copy[] = { const struct mode_key_cmdstr mode_key_cmdstr_copy[] = {
{ MODEKEYCOPY_BACKTOINDENTATION, "back-to-indentation" }, { MODEKEYCOPY_BACKTOINDENTATION, "back-to-indentation" },
{ MODEKEYCOPY_BOTTOMLINE, "bottom-line" }, { MODEKEYCOPY_BOTTOMLINE, "bottom-line" },
{ MODEKEYCOPY_CANCEL, "cancel" }, { MODEKEYCOPY_CANCEL, "cancel" },
@ -384,7 +384,7 @@ mode_key_cmp(struct mode_key_binding *mbind1, struct mode_key_binding *mbind2)
} }
const char * const char *
mode_key_tostring(struct mode_key_cmdstr *cmdstr, enum mode_key_cmd cmd) mode_key_tostring(const struct mode_key_cmdstr *cmdstr, enum mode_key_cmd cmd)
{ {
for (; cmdstr->name != NULL; cmdstr++) { for (; cmdstr->name != NULL; cmdstr++) {
if (cmdstr->cmd == cmd) if (cmdstr->cmd == cmd)
@ -394,7 +394,7 @@ mode_key_tostring(struct mode_key_cmdstr *cmdstr, enum mode_key_cmd cmd)
} }
enum mode_key_cmd enum mode_key_cmd
mode_key_fromstring(struct mode_key_cmdstr *cmdstr, const char *name) mode_key_fromstring(const struct mode_key_cmdstr *cmdstr, const char *name)
{ {
for (; cmdstr->name != NULL; cmdstr++) { for (; cmdstr->name != NULL; cmdstr++) {
if (strcasecmp(cmdstr->name, name) == 0) if (strcasecmp(cmdstr->name, name) == 0)

10
tmux.h
View File

@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.598 2011-01-03 23:30:43 tcunha Exp $ */ /* $Id: tmux.h,v 1.599 2011-01-03 23:31:26 tcunha Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -531,7 +531,7 @@ struct mode_key_cmdstr {
/* Named mode key table description. */ /* Named mode key table description. */
struct mode_key_table { struct mode_key_table {
const char *name; const char *name;
struct mode_key_cmdstr *cmdstr; const struct mode_key_cmdstr *cmdstr;
struct mode_key_tree *tree; struct mode_key_tree *tree;
const struct mode_key_entry *table; /* default entries */ const struct mode_key_entry *table; /* default entries */
}; };
@ -1325,8 +1325,10 @@ extern struct mode_key_tree mode_key_tree_emacs_choice;
extern struct mode_key_tree mode_key_tree_emacs_copy; extern struct mode_key_tree mode_key_tree_emacs_copy;
int mode_key_cmp(struct mode_key_binding *, struct mode_key_binding *); int mode_key_cmp(struct mode_key_binding *, struct mode_key_binding *);
SPLAY_PROTOTYPE(mode_key_tree, mode_key_binding, entry, mode_key_cmp); SPLAY_PROTOTYPE(mode_key_tree, mode_key_binding, entry, mode_key_cmp);
const char *mode_key_tostring(struct mode_key_cmdstr *r, enum mode_key_cmd); const char *mode_key_tostring(const struct mode_key_cmdstr *,
enum mode_key_cmd mode_key_fromstring(struct mode_key_cmdstr *, const char *); enum mode_key_cmd);
enum mode_key_cmd mode_key_fromstring(const struct mode_key_cmdstr *,
const char *);
const struct mode_key_table *mode_key_findtable(const char *); const struct mode_key_table *mode_key_findtable(const char *);
void mode_key_init_trees(void); void mode_key_init_trees(void);
void mode_key_init(struct mode_key_data *, struct mode_key_tree *); void mode_key_init(struct mode_key_data *, struct mode_key_tree *);