summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/cmd-attach-session.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2015-10-28 09:51:55 +0000
committernicm <nicm@openbsd.org>2015-10-28 09:51:55 +0000
commitfb46cb3d45f8409388c0708ceae7c35b9816d7d2 (patch)
tree82a82e31962a2960a835e9e60a7a64ffff21728f /usr.bin/tmux/cmd-attach-session.c
parentkern.cptime is length 2 (diff)
downloadwireguard-openbsd-fb46cb3d45f8409388c0708ceae7c35b9816d7d2.tar.xz
wireguard-openbsd-fb46cb3d45f8409388c0708ceae7c35b9816d7d2.zip
Like options, move the environ struct into environ.c.
Diffstat (limited to 'usr.bin/tmux/cmd-attach-session.c')
-rw-r--r--usr.bin/tmux/cmd-attach-session.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/tmux/cmd-attach-session.c b/usr.bin/tmux/cmd-attach-session.c
index 2e3c6413305..94e337686ad 100644
--- a/usr.bin/tmux/cmd-attach-session.c
+++ b/usr.bin/tmux/cmd-attach-session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-attach-session.c,v 1.44 2015/10/27 15:58:42 nicm Exp $ */
+/* $OpenBSD: cmd-attach-session.c,v 1.45 2015/10/28 09:51:55 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -123,7 +123,7 @@ cmd_attach_session(struct cmd_q *cmdq, const char *tflag, int dflag, int rflag,
if (!Eflag) {
update = options_get_string(s->options,
"update-environment");
- environ_update(update, &c->environ, &s->environ);
+ environ_update(update, c->environ, s->environ);
}
c->session = s;
@@ -154,7 +154,7 @@ cmd_attach_session(struct cmd_q *cmdq, const char *tflag, int dflag, int rflag,
if (!Eflag) {
update = options_get_string(s->options,
"update-environment");
- environ_update(update, &c->environ, &s->environ);
+ environ_update(update, c->environ, s->environ);
}
c->session = s;