From bd5918760ecd1f40a574ccc8a302af869f68c27f Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 11 Dec 2015 15:46:57 +0000
Subject: We cannot do hooks_find and then hooks_remove because it might have
 come 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).
---
 tmux.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 082c9068..a20b96c5 100644
--- a/tmux.h
+++ b/tmux.h
@@ -703,7 +703,7 @@ struct hook {
 
 /* Option data structures. */
 struct options_entry {
-	char		*name;
+	const char		*name;
 
 	enum {
 		OPTIONS_STRING,
@@ -1514,7 +1514,7 @@ struct hook	*hooks_first(struct hooks *);
 struct hook	*hooks_next(struct hook *);
 void		 hooks_add(struct hooks *, const char *, struct cmd_list *);
 void		 hooks_copy(struct hooks *, struct hooks *);
-void		 hooks_remove(struct hooks *, struct hook *);
+void		 hooks_remove(struct hooks *, const char *);
 struct hook	*hooks_find(struct hooks *, const char *);
 void		 hooks_run(struct hooks *, const char *, struct client *);
 
-- 
cgit