circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix constness of cmd_template_replace.

pull/1/head
Nicholas Marriott 2013-02-13 10:19:43 +00:00
parent 36fe146a74
commit 544c80d715
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd-choose-tree.c
View File

@ -174,7 +174,7 @@ cmd_choose_tree_exec(struct cmd *self, struct cmd_ctx *ctx)
} }
wcd = window_choose_add_session(wl->window->active, 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 we're just choosing sessions, skip choosing windows. */
if (sflag && !wflag) { if (sflag && !wflag) {

2
cmd.c
View File

@ -1221,7 +1221,7 @@ cmd_find_pane_offset(const char *paneptr, struct winlink *wl)
/* Replace the first %% or %idx in template by s. */ /* Replace the first %% or %idx in template by s. */
char * 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 ch;
char *buf, *ptr; char *buf, *ptr;

4
tmux.h
View File

@ -1720,7 +1720,7 @@ int cmd_find_index(
struct cmd_ctx *, const char *, struct session **); struct cmd_ctx *, const char *, struct session **);
struct winlink *cmd_find_pane(struct cmd_ctx *, struct winlink *cmd_find_pane(struct cmd_ctx *,
const char *, struct session **, struct window_pane **); 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 *); const char *cmd_get_default_path(struct cmd_ctx *, const char *);
extern const struct cmd_entry *cmd_table[]; extern const struct cmd_entry *cmd_table[];
extern const struct cmd_entry cmd_attach_session_entry; 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); const char *, char *, u_int);
struct window_choose_data *window_choose_add_session(struct window_pane *, struct window_choose_data *window_choose_add_session(struct window_pane *,
struct client *, struct session *, const char *, 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 window_choose_data *window_choose_add_item(struct window_pane *,
struct client *, struct winlink *, const char *, struct client *, struct winlink *, const char *,
char *, u_int); char *, u_int);

2
window-choose.c
View File

@ -864,7 +864,7 @@ window_choose_scroll_down(struct window_pane *wp)
struct window_choose_data * struct window_choose_data *
window_choose_add_session(struct window_pane *wp, struct client *c, 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; struct window_choose_data *wcd;