diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2012-01-20 19:54:08 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2012-01-20 19:54:08 +0000 |
| commit | d98928a4c2ed63a9d7f711457e87667a80d88ccb (patch) | |
| tree | 1eec4574bbc4405dc9d83607efb8a07cf25252a4 /usr.bin | |
| parent | a2c81e16f9686ba2e811d127711101acaf573cba (diff) | |
Add some const and fix a warning.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/tmux/cmd-new-window.c | 5 | ||||
| -rw-r--r-- | usr.bin/tmux/cmd-split-window.c | 6 | ||||
| -rw-r--r-- | usr.bin/tmux/cmd.c | 6 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.h | 4 |
4 files changed, 11 insertions, 10 deletions
diff --git a/usr.bin/tmux/cmd-new-window.c b/usr.bin/tmux/cmd-new-window.c index 68a792fac71..32ba586f96f 100644 --- a/usr.bin/tmux/cmd-new-window.c +++ b/usr.bin/tmux/cmd-new-window.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-new-window.c,v 1.18 2011/12/09 16:28:18 nicm Exp $ */ +/* $OpenBSD: cmd-new-window.c,v 1.19 2012/01/20 19:54:07 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -44,7 +44,8 @@ cmd_new_window_exec(struct cmd *self, struct cmd_ctx *ctx) struct args *args = self->args; struct session *s; struct winlink *wl; - char *cmd, *cwd, *cause; + const char *cmd, *cwd; + char *cause; int idx, last, detached; if (args_has(args, 'a')) { diff --git a/usr.bin/tmux/cmd-split-window.c b/usr.bin/tmux/cmd-split-window.c index 1bdd8ef3a4d..a9bbcb70698 100644 --- a/usr.bin/tmux/cmd-split-window.c +++ b/usr.bin/tmux/cmd-split-window.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-split-window.c,v 1.26 2011/12/09 16:28:18 nicm Exp $ */ +/* $OpenBSD: cmd-split-window.c,v 1.27 2012/01/20 19:54:07 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -58,8 +58,8 @@ cmd_split_window_exec(struct cmd *self, struct cmd_ctx *ctx) struct window *w; struct window_pane *wp, *new_wp = NULL; struct environ env; - char *cmd, *cwd, *cause, *new_cause; - const char *shell; + const char *cmd, *cwd, *shell; + char *cause, *new_cause; u_int hlimit, paneidx; int size, percentage; enum layout_type type; diff --git a/usr.bin/tmux/cmd.c b/usr.bin/tmux/cmd.c index 5e01699eff3..d9280b7c7d8 100644 --- a/usr.bin/tmux/cmd.c +++ b/usr.bin/tmux/cmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd.c,v 1.58 2011/12/27 14:07:20 stsp Exp $ */ +/* $OpenBSD: cmd.c,v 1.59 2012/01/20 19:54:07 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -1215,10 +1215,10 @@ cmd_template_replace(char *template, const char *s, int idx) } /* Return the default path for a new pane. */ -char * +const char * cmd_get_default_path(struct cmd_ctx *ctx) { - char *cwd; + const char *cwd; struct session *s; struct window_pane *wp; struct environ_entry *envent; diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index 2b34ba13480..27015ebb93c 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.302 2012/01/20 19:10:29 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.303 2012/01/20 19:54:07 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -1565,7 +1565,7 @@ int cmd_find_index( 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_get_default_path(struct cmd_ctx *ctx); +const char *cmd_get_default_path(struct cmd_ctx *ctx); extern const struct cmd_entry *cmd_table[]; extern const struct cmd_entry cmd_attach_session_entry; extern const struct cmd_entry cmd_bind_key_entry; |