Revision: 2664
http://tmux.svn.sourceforge.net/tmux/?rev=2664&view=rev
Author: tcunha
Date: 2012-01-20 21:21:32 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
Sync OpenBSD patchset 1002:
Add some const and fix a warning.
Modified Paths:
--------------
trunk/cmd-new-window.c
trunk/cmd-split-window.c
trunk/cmd.c
trunk/tmux.h
Modified: trunk/cmd-new-window.c
===================================================================
--- trunk/cmd-new-window.c 2012-01-20 21:20:35 UTC (rev 2663)
+++ trunk/cmd-new-window.c 2012-01-20 21:21:32 UTC (rev 2664)
@@ -44,7 +44,8 @@
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')) {
Modified: trunk/cmd-split-window.c
===================================================================
--- trunk/cmd-split-window.c 2012-01-20 21:20:35 UTC (rev 2663)
+++ trunk/cmd-split-window.c 2012-01-20 21:21:32 UTC (rev 2664)
@@ -57,8 +57,8 @@
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;
Modified: trunk/cmd.c
===================================================================
--- trunk/cmd.c 2012-01-20 21:20:35 UTC (rev 2663)
+++ trunk/cmd.c 2012-01-20 21:21:32 UTC (rev 2664)
@@ -1214,10 +1214,10 @@
}
/* 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;
Modified: trunk/tmux.h
===================================================================
--- trunk/tmux.h 2012-01-20 21:20:35 UTC (rev 2663)
+++ trunk/tmux.h 2012-01-20 21:21:32 UTC (rev 2664)
@@ -1561,7 +1561,7 @@
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;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
