diff options
| author | Thomas Adam <thomas@xteddy.org> | 2014-06-20 12:59:43 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2014-06-20 12:59:43 +0100 |
| commit | 814e40522cb611895e84fc2aaf58d5d0ca9ba348 (patch) | |
| tree | 12e56d683fbcadf4d67f8a78acf8afcf1343ba0b /key-bindings.c | |
| parent | 1544c688e6bdc61fec8a96588b2552551753e46b (diff) | |
| parent | c8efffb4db5c521640dd5687d2a640ca04664aad (diff) | |
| download | rtmux-814e40522cb611895e84fc2aaf58d5d0ca9ba348.tar.gz rtmux-814e40522cb611895e84fc2aaf58d5d0ca9ba348.tar.bz2 rtmux-814e40522cb611895e84fc2aaf58d5d0ca9ba348.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'key-bindings.c')
| -rw-r--r-- | key-bindings.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/key-bindings.c b/key-bindings.c index f725508b..58be0c6f 100644 --- a/key-bindings.c +++ b/key-bindings.c @@ -27,7 +27,6 @@ RB_GENERATE(key_bindings, key_binding, entry, key_bindings_cmp); struct key_bindings key_bindings; -struct key_bindings dead_key_bindings; int key_bindings_cmp(struct key_binding *bd1, struct key_binding *bd2) @@ -78,20 +77,8 @@ key_bindings_remove(int key) if ((bd = key_bindings_lookup(key)) == NULL) return; RB_REMOVE(key_bindings, &key_bindings, bd); - RB_INSERT(key_bindings, &dead_key_bindings, bd); -} - -void -key_bindings_clean(void) -{ - struct key_binding *bd; - - while (!RB_EMPTY(&dead_key_bindings)) { - bd = RB_ROOT(&dead_key_bindings); - RB_REMOVE(key_bindings, &dead_key_bindings, bd); - cmd_list_free(bd->cmdlist); - free(bd); - } + cmd_list_free(bd->cmdlist); + free(bd); } void |