From 544c80d71534adc8f2d3843d06b01655dc02f1a9 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 13 Feb 2013 10:19:43 +0000 Subject: [PATCH] Fix constness of cmd_template_replace. --- cmd-choose-tree.c | 2 +- cmd.c | 2 +- tmux.h | 4 ++-- window-choose.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd-choose-tree.c b/cmd-choose-tree.c index 02796630..e12e4c30 100644 --- a/cmd-choose-tree.c +++ b/cmd-choose-tree.c @@ -174,7 +174,7 @@ cmd_choose_tree_exec(struct cmd *self, struct cmd_ctx *ctx) } wcd = window_choose_add_session(wl->window->active, - c, s2, ses_template, (char *)ses_action, idx_ses); + c, s2, ses_template, ses_action, idx_ses); /* If we're just choosing sessions, skip choosing windows. */ if (sflag && !wflag) { diff --git a/cmd.c b/cmd.c index 6869c12c..d30279a3 100644 --- a/cmd.c +++ b/cmd.c @@ -1221,7 +1221,7 @@ cmd_find_pane_offset(const char *paneptr, struct winlink *wl) /* Replace the first %% or %idx in template by s. */ char * -cmd_template_replace(char *template, const char *s, int idx) +cmd_template_replace(const char *template, const char *s, int idx) { char ch; char *buf, *ptr; diff --git a/tmux.h b/tmux.h index 78a5c81d..2b4a68b6 100644 --- a/tmux.h +++ b/tmux.h @@ -1720,7 +1720,7 @@ int cmd_find_index( struct cmd_ctx *, const char *, struct session **); struct winlink *cmd_find_pane(struct cmd_ctx *, const char *, struct session **, struct window_pane **); -char *cmd_template_replace(char *, const char *, int); +char *cmd_template_replace(const char *, const char *, int); const char *cmd_get_default_path(struct cmd_ctx *, const char *); extern const struct cmd_entry *cmd_table[]; extern const struct cmd_entry cmd_attach_session_entry; @@ -2207,7 +2207,7 @@ struct window_choose_data *window_choose_add_window(struct window_pane *, const char *, char *, u_int); struct window_choose_data *window_choose_add_session(struct window_pane *, struct client *, struct session *, const char *, - char *, u_int); + const char *, u_int); struct window_choose_data *window_choose_add_item(struct window_pane *, struct client *, struct winlink *, const char *, char *, u_int); diff --git a/window-choose.c b/window-choose.c index d461887a..0d386fd8 100644 --- a/window-choose.c +++ b/window-choose.c @@ -864,7 +864,7 @@ window_choose_scroll_down(struct window_pane *wp) struct window_choose_data * window_choose_add_session(struct window_pane *wp, struct client *c, - struct session *s, const char *template, char *action, u_int idx) + struct session *s, const char *template, const char *action, u_int idx) { struct window_choose_data *wcd;