mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-10-26 12:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

We cannot do hooks_find and then hooks_remove because it might have come

Browse Source 
from the parent (global) tree, instead make it remove by name like options.

While here, also tidy up a few bits of options and hooks handling (use
RB_FOREACH_SAFE, and a helper function for the free).
This commit is contained in:
nicm
2015-12-11 15:46:57 +00:00
parent d7e11d0af7
commit bd5918760e
4 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
hooks.c
View File

@@ -32,7 +32,8 @@ static int hooks_cmp(struct hook *, struct hook *);
RB_PROTOTYPE(hooks_tree, hook, entry, hooks_cmp);
RB_GENERATE(hooks_tree, hook, entry, hooks_cmp);
struct hook *hooks_find1(struct hooks *, const char *);
static struct hook *hooks_find1(struct hooks *, const char *);
static void hooks_free1(struct hooks *, struct hook *);
static int
hooks_cmp(struct hook *hook1, struct hook *hook2)
@@ -51,13 +52,22 @@ hooks_create(struct hooks *parent)
return (hooks);
}
static void
hooks_free1(struct hooks *hooks, struct hook *hook)
{
RB_REMOVE(hooks_tree, &hooks->tree, hook);
cmd_list_free(hook->cmdlist);
free((char *)hook->name);
free(hook);
}
void
hooks_free(struct hooks *hooks)
{
struct hook *hook, *hook1;
RB_FOREACH_SAFE(hook, hooks_tree, &hooks->tree, hook1)
hooks_remove(hooks, hook);
hooks_free1(hooks, hook);
free(hooks);
}
@@ -79,7 +89,7 @@ hooks_add(struct hooks *hooks, const char *name, struct cmd_list *cmdlist)
struct hook *hook;
if ((hook = hooks_find1(hooks, name)) != NULL)
hooks_remove(hooks, hook);
hooks_free1(hooks, hook);
hook = xcalloc(1, sizeof *hook);
hook->name = xstrdup(name);
@@ -89,15 +99,15 @@ hooks_add(struct hooks *hooks, const char *name, struct cmd_list *cmdlist)
}
void
hooks_remove(struct hooks *hooks, struct hook *hook)
hooks_remove(struct hooks *hooks, const char *name)
{
RB_REMOVE(hooks_tree, &hooks->tree, hook);
cmd_list_free(hook->cmdlist);
free((char *) hook->name);
free(hook);
struct hook *hook;
if ((hook = hooks_find1(hooks, name)) != NULL)
hooks_free1(hooks, hook);
}
struct hook *
static struct hook *
hooks_find1(struct hooks *hooks, const char *name)
{
struct hook hook;