summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2009-12-11 13:58:48 +0000
committerNicholas Marriott <nicm@openbsd.org>2009-12-11 13:58:48 +0000
commit3f58cbaae91ac941c34bad3cb2447d6bcc541a2d (patch)
treee76f78c1521ad06b2dbc9cc611fef147c2103bfd
parenta4c9a80dacf405623698acfc971d636bbc0e43c7 (diff)
Use quiet variable, and add missing sentinel to options array.
-rw-r--r--cmd-set-option.c1
-rw-r--r--tmux.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/cmd-set-option.c b/cmd-set-option.c
index 64b78448..1a4df533 100644
--- a/cmd-set-option.c
+++ b/cmd-set-option.c
@@ -75,6 +75,7 @@ const char *set_option_bell_action_list[] = {
const struct set_option_entry set_option_table[] = {
{ "quiet", SET_OPTION_FLAG, 0, 0, NULL },
+ { NULL, 0, 0, 0, NULL }
};
const struct set_option_entry set_session_option_table[] = {
diff --git a/tmux.c b/tmux.c
index 209042af..540c6f9f 100644
--- a/tmux.c
+++ b/tmux.c
@@ -229,7 +229,7 @@ main(int argc, char **argv)
char cwd[MAXPATHLEN], **var;
void *buf;
size_t len;
- int opt, flags, quiet, cmdflags = 0;
+ int opt, flags, quiet = 0, cmdflags = 0;
short events;
#ifdef DEBUG
@@ -316,7 +316,7 @@ main(int argc, char **argv)
options_init(&global_options, NULL);
oo = &global_options;
- options_set_number(oo, "quiet", 0);
+ options_set_number(oo, "quiet", quiet);
options_init(&global_s_options, NULL);
so = &global_s_options;