summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2013-03-22 15:50:43 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2013-03-22 15:50:43 +0000
commita3489039ab1e001017ff9aba74c9e1a6a44f415a (patch)
treeeb1fa73c353c39ca2376ee46aef556b1f80f2bf2
parent833bed7575853006ef1fa25f8b1e698b94c918dc (diff)
Remove unnecessary initializers of cmd_ctx.
-rw-r--r--usr.bin/tmux/cmd-command-prompt.c5
-rw-r--r--usr.bin/tmux/cmd-confirm-before.c5
-rw-r--r--usr.bin/tmux/control.c5
-rw-r--r--usr.bin/tmux/key-bindings.c5
-rw-r--r--usr.bin/tmux/server-client.c4
-rw-r--r--usr.bin/tmux/window-choose.c5
6 files changed, 6 insertions, 23 deletions
diff --git a/usr.bin/tmux/cmd-command-prompt.c b/usr.bin/tmux/cmd-command-prompt.c
index 21584a20da4..46aabd4c548 100644
--- a/usr.bin/tmux/cmd-command-prompt.c
+++ b/usr.bin/tmux/cmd-command-prompt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-command-prompt.c,v 1.22 2013/03/22 15:49:55 nicm Exp $ */
+/* $OpenBSD: cmd-command-prompt.c,v 1.23 2013/03/22 15:50:42 nicm Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -185,10 +185,7 @@ cmd_command_prompt_callback(void *data, const char *s)
}
ctx = cmd_get_ctx();
- ctx->msgdata = NULL;
ctx->curclient = c;
- ctx->cmdclient = NULL;
-
ctx->error = key_bindings_error;
ctx->print = key_bindings_print;
ctx->info = key_bindings_info;
diff --git a/usr.bin/tmux/cmd-confirm-before.c b/usr.bin/tmux/cmd-confirm-before.c
index 7c3ca0ab87d..6d8ae58164e 100644
--- a/usr.bin/tmux/cmd-confirm-before.c
+++ b/usr.bin/tmux/cmd-confirm-before.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-confirm-before.c,v 1.15 2013/03/22 15:49:55 nicm Exp $ */
+/* $OpenBSD: cmd-confirm-before.c,v 1.16 2013/03/22 15:50:42 nicm Exp $ */
/*
* Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -126,10 +126,7 @@ cmd_confirm_before_callback(void *data, const char *s)
}
ctx = cmd_get_ctx();
- ctx->msgdata = NULL;
ctx->curclient = c;
- ctx->cmdclient = NULL;
-
ctx->error = key_bindings_error;
ctx->print = key_bindings_print;
ctx->info = key_bindings_info;
diff --git a/usr.bin/tmux/control.c b/usr.bin/tmux/control.c
index 0ce139b41c9..3dfe0751623 100644
--- a/usr.bin/tmux/control.c
+++ b/usr.bin/tmux/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.5 2013/03/22 15:49:55 nicm Exp $ */
+/* $OpenBSD: control.c,v 1.6 2013/03/22 15:50:42 nicm Exp $ */
/*
* Copyright (c) 2012 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -109,10 +109,7 @@ control_callback(struct client *c, int closed, unused void *data)
}
ctx = cmd_get_ctx();
- ctx->msgdata = NULL;
- ctx->cmdclient = NULL;
ctx->curclient = c;
-
ctx->error = control_msg_error;
ctx->print = control_msg_print;
ctx->info = control_msg_info;
diff --git a/usr.bin/tmux/key-bindings.c b/usr.bin/tmux/key-bindings.c
index 43738fbf777..ad0581015ec 100644
--- a/usr.bin/tmux/key-bindings.c
+++ b/usr.bin/tmux/key-bindings.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: key-bindings.c,v 1.35 2013/03/22 15:49:55 nicm Exp $ */
+/* $OpenBSD: key-bindings.c,v 1.36 2013/03/22 15:50:42 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -267,10 +267,7 @@ key_bindings_dispatch(struct key_binding *bd, struct client *c)
int readonly;
ctx = cmd_get_ctx();
- ctx->msgdata = NULL;
- ctx->cmdclient = NULL;
ctx->curclient = c;
-
ctx->error = key_bindings_error;
ctx->print = key_bindings_print;
ctx->info = key_bindings_info;
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c
index f3ea551db6d..365fc425e46 100644
--- a/usr.bin/tmux/server-client.c
+++ b/usr.bin/tmux/server-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-client.c,v 1.88 2013/03/22 15:49:55 nicm Exp $ */
+/* $OpenBSD: server-client.c,v 1.89 2013/03/22 15:50:42 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -872,9 +872,7 @@ server_client_msg_command(struct client *c, struct msg_command_data *data)
ctx = cmd_get_ctx();
ctx->msgdata = data;
- ctx->curclient = NULL;
ctx->cmdclient = c;
-
ctx->error = server_client_msg_error;
ctx->print = server_client_msg_print;
ctx->info = server_client_msg_info;
diff --git a/usr.bin/tmux/window-choose.c b/usr.bin/tmux/window-choose.c
index 5ec3ac4d51c..817ef94cfbf 100644
--- a/usr.bin/tmux/window-choose.c
+++ b/usr.bin/tmux/window-choose.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-choose.c,v 1.41 2013/03/22 15:49:55 nicm Exp $ */
+/* $OpenBSD: window-choose.c,v 1.42 2013/03/22 15:50:42 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -221,10 +221,7 @@ window_choose_data_run(struct window_choose_data *cdata)
}
ctx = cmd_get_ctx();
- ctx->msgdata = NULL;
ctx->curclient = cdata->start_client;
- ctx->cmdclient = NULL;
-
ctx->error = key_bindings_error;
ctx->print = key_bindings_print;
ctx->info = key_bindings_info;