diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-02-10 17:36:58 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-02-10 17:36:58 +0000 |
| commit | aadc87f5a79865f404f4b6cb0f4892daa17e7365 (patch) | |
| tree | f74e8dd1f1ec3d6fe96aa01fe5be17ee406ce3b6 | |
| parent | 4d382ae8e6c71c5414dc41053223c05400d923f8 (diff) | |
| download | rtmux-aadc87f5a79865f404f4b6cb0f4892daa17e7365.tar.gz rtmux-aadc87f5a79865f404f4b6cb0f4892daa17e7365.tar.bz2 rtmux-aadc87f5a79865f404f4b6cb0f4892daa17e7365.zip | |
Remove free callback for window_choose_data objects.
| -rw-r--r-- | cmd-choose-buffer.c | 2 | ||||
| -rw-r--r-- | cmd-choose-client.c | 2 | ||||
| -rw-r--r-- | cmd-choose-list.c | 2 | ||||
| -rw-r--r-- | cmd-choose-tree.c | 2 | ||||
| -rw-r--r-- | cmd-find-window.c | 3 | ||||
| -rw-r--r-- | tmux.h | 3 | ||||
| -rw-r--r-- | window-choose.c | 6 |
7 files changed, 7 insertions, 13 deletions
diff --git a/cmd-choose-buffer.c b/cmd-choose-buffer.c index 21f74f1c..c002196c 100644 --- a/cmd-choose-buffer.c +++ b/cmd-choose-buffer.c @@ -91,7 +91,7 @@ cmd_choose_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) } free(action); - window_choose_ready(wl->window->active, 0, NULL, NULL); + window_choose_ready(wl->window->active, 0, NULL); return (CMD_RETURN_NORMAL); } diff --git a/cmd-choose-client.c b/cmd-choose-client.c index 0748072d..0c1eb070 100644 --- a/cmd-choose-client.c +++ b/cmd-choose-client.c @@ -101,7 +101,7 @@ cmd_choose_client_exec(struct cmd *self, struct cmd_ctx *ctx) free(action); window_choose_ready(wl->window->active, cur, - cmd_choose_client_callback, NULL); + cmd_choose_client_callback); return (CMD_RETURN_NORMAL); } diff --git a/cmd-choose-list.c b/cmd-choose-list.c index 5f83447c..136cd4c4 100644 --- a/cmd-choose-list.c +++ b/cmd-choose-list.c @@ -89,7 +89,7 @@ cmd_choose_list_exec(struct cmd *self, struct cmd_ctx *ctx) return (CMD_RETURN_ERROR); } - window_choose_ready(wl->window->active, 0, NULL, NULL); + window_choose_ready(wl->window->active, 0, NULL); free(template); diff --git a/cmd-choose-tree.c b/cmd-choose-tree.c index d3dfc7ff..77eda5d7 100644 --- a/cmd-choose-tree.c +++ b/cmd-choose-tree.c @@ -227,7 +227,7 @@ windows_only: free(final_win_template_middle); free(final_win_template_last); - window_choose_ready(wl->window->active, cur_win, NULL, NULL); + window_choose_ready(wl->window->active, cur_win, NULL); if (args_has(args, 'u')) window_choose_expand_all(wl->window->active); diff --git a/cmd-find-window.c b/cmd-find-window.c index 5c1b2133..29ac2845 100644 --- a/cmd-find-window.c +++ b/cmd-find-window.c @@ -198,8 +198,7 @@ cmd_find_window_exec(struct cmd *self, struct cmd_ctx *ctx) window_choose_add(wl->window->active, cdata); } - window_choose_ready(wl->window->active, 0, cmd_find_window_callback, - NULL); + window_choose_ready(wl->window->active, 0, cmd_find_window_callback); out: ARRAY_FREE(&find_list); @@ -2198,8 +2198,7 @@ extern const struct window_mode window_choose_mode; void window_choose_add(struct window_pane *, struct window_choose_data *); void window_choose_ready(struct window_pane *, - u_int, void (*)(struct window_choose_data *), - void (*)(struct window_choose_data *)); + u_int, void (*)(struct window_choose_data *)); struct window_choose_data *window_choose_data_create (int, struct client *, struct session *); void window_choose_data_free(struct window_choose_data *); diff --git a/window-choose.c b/window-choose.c index 28a8e052..21d6aec7 100644 --- a/window-choose.c +++ b/window-choose.c @@ -103,8 +103,7 @@ window_choose_add(struct window_pane *wp, struct window_choose_data *wcd) void window_choose_ready(struct window_pane *wp, u_int cur, - void (*callbackfn)(struct window_choose_data *), - void (*freefn)(struct window_choose_data *)) + void (*callbackfn)(struct window_choose_data *)) { struct window_choose_mode_data *data = wp->modedata; struct screen *s = &data->screen; @@ -116,7 +115,6 @@ window_choose_ready(struct window_pane *wp, u_int cur, data->callbackfn = callbackfn; if (data->callbackfn == NULL) data->callbackfn = window_choose_default_callback; - data->freefn = freefn; ARRAY_CONCAT(&data->old_list, &data->list); @@ -256,8 +254,6 @@ window_choose_free(struct window_pane *wp) for (i = 0; i < ARRAY_LENGTH(&data->old_list); i++) { item = &ARRAY_ITEM(&data->old_list, i); - if (data->freefn != NULL && item->wcd != NULL) - data->freefn(item->wcd); window_choose_data_free(item->wcd); free(item->name); } |