diff options
| author |   nicm <nicm@openbsd.org> | 2017-03-17 14:51:41 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2017-03-17 14:51:41 +0000 |
| commit | 6245f9005a0cc98a6501a7a9621af98ca66f2856 (patch) | |
| tree | 6e4e4eb47a0902a7cdc87c6f0e5501fcb5bf4b8d | |
| parent | Grow buffers using recallocarray, to avoid the potential dribble that (diff) | |
| download | wireguard-openbsd-6245f9005a0cc98a6501a7a9621af98ca66f2856.tar.xz wireguard-openbsd-6245f9005a0cc98a6501a7a9621af98ca66f2856.zip | |
Fix a couple of argument types.
| -rw-r--r-- | usr.bin/tmux/cmd-show-messages.c | 6 | ||||
| -rw-r--r-- | usr.bin/tmux/utf8.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/tmux/cmd-show-messages.c b/usr.bin/tmux/cmd-show-messages.c index 62df9241131..9db99051de0 100644 --- a/usr.bin/tmux/cmd-show-messages.c +++ b/usr.bin/tmux/cmd-show-messages.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-show-messages.c,v 1.24 2017/01/24 19:59:19 nicm Exp $ */ +/* $OpenBSD: cmd-show-messages.c,v 1.25 2017/03/17 14:51:41 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -81,8 +81,8 @@ cmd_show_messages_jobs(struct cmdq_item *item, int blank) cmdq_print(item, "%s", ""); blank = 0; } - cmdq_print(item, "Job %u: %s [fd=%d, pid=%d, status=%d]", - n, job->cmd, job->fd, job->pid, job->status); + cmdq_print(item, "Job %u: %s [fd=%d, pid=%ld, status=%d]", + n, job->cmd, job->fd, (long)job->pid, job->status); n++; } return (n != 0); diff --git a/usr.bin/tmux/utf8.c b/usr.bin/tmux/utf8.c index 5a366627987..d00f4b3ec11 100644 --- a/usr.bin/tmux/utf8.c +++ b/usr.bin/tmux/utf8.c @@ -1,4 +1,4 @@ -/* $OpenBSD: utf8.c,v 1.35 2017/01/18 10:08:05 nicm Exp $ */ +/* $OpenBSD: utf8.c,v 1.36 2017/03/17 14:51:41 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -112,7 +112,7 @@ utf8_width(wchar_t wc) width = wcwidth(wc); if (width < 0 || width > 0xff) { - log_debug("Unicode %04x, wcwidth() %d", wc, width); + log_debug("Unicode %04lx, wcwidth() %d", (long)wc, width); return (-1); } return (width); |