aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2009-11-13 16:58:24 +0000
committerTiago Cunha <tcunha@gmx.com>2009-11-13 16:58:24 +0000
commit0986001908801ebaab01e909940ff9a107562a99 (patch)
treef27f561663e94a01063238b56fb92c6e1cb2bc79
parent2bd39071d3e5add8e734d31566574f7dbf54ee4b (diff)
downloadrtmux-0986001908801ebaab01e909940ff9a107562a99.tar.gz
rtmux-0986001908801ebaab01e909940ff9a107562a99.tar.bz2
rtmux-0986001908801ebaab01e909940ff9a107562a99.zip
Sync OpenBSD patchset 533:
Zap unused functions, prompted by deraadt.
-rw-r--r--key-bindings.c16
-rw-r--r--mode-key.c17
-rw-r--r--tmux.h4
3 files changed, 3 insertions, 34 deletions
diff --git a/key-bindings.c b/key-bindings.c
index 6756335f..bdf67233 100644
--- a/key-bindings.c
+++ b/key-bindings.c
@@ -1,4 +1,4 @@
-/* $Id: key-bindings.c,v 1.83 2009-10-06 14:14:07 tcunha Exp $ */
+/* $Id: key-bindings.c,v 1.84 2009-11-13 16:58:24 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -187,20 +187,6 @@ key_bindings_init(void)
}
}
-void
-key_bindings_free(void)
-{
- struct key_binding *bd;
-
- key_bindings_clean();
- while (!SPLAY_EMPTY(&key_bindings)) {
- bd = SPLAY_ROOT(&key_bindings);
- SPLAY_REMOVE(key_bindings, &key_bindings, bd);
- cmd_list_free(bd->cmdlist);
- xfree(bd);
- }
-}
-
void printflike2
key_bindings_error(struct cmd_ctx *ctx, const char *fmt, ...)
{
diff --git a/mode-key.c b/mode-key.c
index 9d55ceb9..244137d0 100644
--- a/mode-key.c
+++ b/mode-key.c
@@ -1,4 +1,4 @@
-/* $Id: mode-key.c,v 1.34 2009-10-15 01:52:47 tcunha Exp $ */
+/* $Id: mode-key.c,v 1.35 2009-11-13 16:58:24 tcunha Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -371,21 +371,6 @@ mode_key_init_trees(void)
}
void
-mode_key_free_trees(void)
-{
- const struct mode_key_table *mtab;
- struct mode_key_binding *mbind;
-
- for (mtab = mode_key_tables; mtab->name != NULL; mtab++) {
- while (!SPLAY_EMPTY(mtab->tree)) {
- mbind = SPLAY_ROOT(mtab->tree);
- SPLAY_REMOVE(mode_key_tree, mtab->tree, mbind);
- xfree(mbind);
- }
- }
-}
-
-void
mode_key_init(struct mode_key_data *mdata, struct mode_key_tree *mtree)
{
mdata->tree = mtree;
diff --git a/tmux.h b/tmux.h
index 4d68bd2d..8b2bc2ce 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1,4 +1,4 @@
-/* $Id: tmux.h,v 1.513 2009-11-13 16:51:49 tcunha Exp $ */
+/* $Id: tmux.h,v 1.514 2009-11-13 16:58:24 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1248,7 +1248,6 @@ const char *mode_key_tostring(struct mode_key_cmdstr *r, enum mode_key_cmd);
enum mode_key_cmd mode_key_fromstring(struct mode_key_cmdstr *, const char *);
const struct mode_key_table *mode_key_findtable(const char *);
void mode_key_init_trees(void);
-void mode_key_free_trees(void);
void mode_key_init(struct mode_key_data *, struct mode_key_tree *);
enum mode_key_cmd mode_key_lookup(struct mode_key_data *, int);
@@ -1540,7 +1539,6 @@ void key_bindings_add(int, int, struct cmd_list *);
void key_bindings_remove(int);
void key_bindings_clean(void);
void key_bindings_init(void);
-void key_bindings_free(void);
void key_bindings_dispatch(struct key_binding *, struct client *);
void printflike2 key_bindings_error(struct cmd_ctx *, const char *, ...);
void printflike2 key_bindings_print(struct cmd_ctx *, const char *, ...);