diff options
| author |   nicm <nicm@openbsd.org> | 2017-04-19 12:44:29 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2017-04-19 12:44:29 +0000 |
| commit | 8eb95462578314b1014a8986848c86e18dda7c8f (patch) | |
| tree | 123973f66b0c471c19d8385c2a5f0de6fccab5a8 | |
| parent | Make the test pass when an obj directory exists. (diff) | |
| download | wireguard-openbsd-8eb95462578314b1014a8986848c86e18dda7c8f.tar.xz wireguard-openbsd-8eb95462578314b1014a8986848c86e18dda7c8f.zip | |
Style nits and a missing cast.
| -rw-r--r-- | usr.bin/tmux/cmd-command-prompt.c | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/grid.c | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/tmux/cmd-command-prompt.c b/usr.bin/tmux/cmd-command-prompt.c index 04046dff4fe..99b274cb7a3 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.41 2017/01/15 22:00:56 nicm Exp $ */ +/* $OpenBSD: cmd-command-prompt.c,v 1.42 2017/04/19 12:44:29 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -192,7 +192,7 @@ cmd_command_prompt_callback(void *data, const char *s, int done) if (!done) free(new_template); - if (c->prompt_callbackfn != (void *)&cmd_command_prompt_callback) + if (c->prompt_callbackfn != cmd_command_prompt_callback) return (1); return (0); } diff --git a/usr.bin/tmux/grid.c b/usr.bin/tmux/grid.c index ba0a4eb2fd7..1a926acba42 100644 --- a/usr.bin/tmux/grid.c +++ b/usr.bin/tmux/grid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grid.c,v 1.68 2017/03/22 07:16:54 nicm Exp $ */ +/* $OpenBSD: grid.c,v 1.69 2017/04/19 12:44:29 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -89,7 +89,7 @@ grid_need_extended_cell(const struct grid_cell_entry *gce, return (1); if (gc->data.size != 1 || gc->data.width != 1) return (1); - if ((gc->fg & COLOUR_FLAG_RGB) ||(gc->bg & COLOUR_FLAG_RGB)) + if ((gc->fg & COLOUR_FLAG_RGB) || (gc->bg & COLOUR_FLAG_RGB)) return (1); return (0); } diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c index bb55e6d9595..e19d871f02e 100644 --- a/usr.bin/tmux/tmux.c +++ b/usr.bin/tmux/tmux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.c,v 1.179 2017/04/16 20:33:46 nicm Exp $ */ +/* $OpenBSD: tmux.c,v 1.180 2017/04/19 12:44:29 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -120,7 +120,7 @@ make_label(const char *label) uid = getuid(); if ((s = getenv("TMUX_TMPDIR")) != NULL && *s != '\0') - xasprintf(&base, "%s/tmux-%u", s, uid); + xasprintf(&base, "%s/tmux-%ld", s, (long)uid); else xasprintf(&base, "%s/tmux-%ld", _PATH_TMP, (long)uid); |