summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2015-04-25 18:49:01 +0000
committernicm <nicm@openbsd.org>2015-04-25 18:49:01 +0000
commita9ce8fc940158c2760cb0f86540a0697a39c9c6b (patch)
tree7efe0a4702ad83d69ff604e5e0a4271a97aaad5c
parentUse a char **,u_int pair for cfg_causes. (diff)
downloadwireguard-openbsd-a9ce8fc940158c2760cb0f86540a0697a39c9c6b.tar.xz
wireguard-openbsd-a9ce8fc940158c2760cb0f86540a0697a39c9c6b.zip
Fix some char* -> char *.
-rw-r--r--usr.bin/tmux/cfg.c20
-rw-r--r--usr.bin/tmux/key-bindings.c6
-rw-r--r--usr.bin/tmux/window.c4
3 files changed, 15 insertions, 15 deletions
diff --git a/usr.bin/tmux/cfg.c b/usr.bin/tmux/cfg.c
index 719429177d1..1afd2e103ab 100644
--- a/usr.bin/tmux/cfg.c
+++ b/usr.bin/tmux/cfg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cfg.c,v 1.35 2015/04/25 18:47:01 nicm Exp $ */
+/* $OpenBSD: cfg.c,v 1.36 2015/04/25 18:49:01 nicm Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -27,12 +27,12 @@
#include "tmux.h"
-struct cmd_q *cfg_cmd_q;
-int cfg_finished;
-int cfg_references;
-char** cfg_causes;
-u_int cfg_ncauses;
-struct client *cfg_client;
+struct cmd_q *cfg_cmd_q;
+int cfg_finished;
+int cfg_references;
+char **cfg_causes;
+u_int cfg_ncauses;
+struct client *cfg_client;
int
load_cfg(const char *path, struct cmd_q *cmdq, char **cause)
@@ -114,10 +114,10 @@ cfg_default_done(unused struct cmd_q *cmdq)
}
void
-cfg_add_cause(const char* fmt, ...)
+cfg_add_cause(const char *fmt, ...)
{
- va_list ap;
- char* msg;
+ va_list ap;
+ char *msg;
va_start(ap, fmt);
xvasprintf(&msg, fmt, ap);
diff --git a/usr.bin/tmux/key-bindings.c b/usr.bin/tmux/key-bindings.c
index 6c980f61b2d..0d16b9b3bfe 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.46 2015/04/21 15:34:32 nicm Exp $ */
+/* $OpenBSD: key-bindings.c,v 1.47 2015/04/25 18:49:01 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -144,7 +144,7 @@ key_bindings_remove_table(const char *name)
void
key_bindings_init(void)
{
- static const char* defaults[] = {
+ static const char *defaults[] = {
"bind C-b send-prefix",
"bind C-o rotate-window",
"bind C-z suspend-client",
@@ -225,7 +225,7 @@ key_bindings_init(void)
};
u_int i;
struct cmd_list *cmdlist;
- char* cause;
+ char *cause;
int error;
struct cmd_q *cmdq;
diff --git a/usr.bin/tmux/window.c b/usr.bin/tmux/window.c
index bd2a421a70c..d3664932001 100644
--- a/usr.bin/tmux/window.c
+++ b/usr.bin/tmux/window.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window.c,v 1.124 2015/04/25 18:33:59 nicm Exp $ */
+/* $OpenBSD: window.c,v 1.125 2015/04/25 18:49:01 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -256,7 +256,7 @@ winlink_stack_remove(struct winlink_stack *stack, struct winlink *wl)
}
struct window *
-window_find_by_id_str(const char* s)
+window_find_by_id_str(const char *s)
{
const char *errstr;
u_int id;