Fix up some printflike attributes.

diff --git a/usr.bin/tmux/control.c b/usr.bin/tmux/control.c
index 6e05f44..5fa84a1 100644 (file)
--- a/usr.bin/tmux/control.c
+++ b/usr.bin/tmux/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.46 2021/08/17 20:17:21 nicm Exp $ */
+/* $OpenBSD: control.c,v 1.47 2021/08/25 07:09:30 nicm Exp $ */
 
 /*
  * Copyright (c) 2012 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -386,7 +386,7 @@ control_pause_pane(struct client *c, struct window_pane *wp)
 }
 
 /* Write a line. */
-static void
+static void printflike(2, 0)
 control_vwrite(struct client *c, const char *fmt, va_list ap)
 {
        struct control_state    *cs = c->control_state;

diff --git a/usr.bin/tmux/log.c b/usr.bin/tmux/log.c
index e52297a..f65f618 100644 (file)
--- a/usr.bin/tmux/log.c
+++ b/usr.bin/tmux/log.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.c,v 1.27 2021/03/31 08:37:48 nicm Exp $ */
+/* $OpenBSD: log.c,v 1.28 2021/08/25 07:09:30 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -30,9 +30,6 @@
 static FILE    *log_file;
 static int      log_level;
 
-static void     log_event_cb(int, const char *);
-static void     log_vwrite(const char *, va_list);
-
 /* Log callback for libevent. */
 static void
 log_event_cb(__unused int severity, const char *msg)
@@ -101,7 +98,7 @@ log_close(void)
 }
 
 /* Write a log message. */
-static void
+static void printflike(1, 0)
 log_vwrite(const char *msg, va_list ap)
 {
        char            *fmt, *out;

diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index 92587f2..fa9fe2d 100644 (file)
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.1135 2021/08/23 12:33:55 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.1136 2021/08/25 07:09:30 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -2342,7 +2342,7 @@ struct cmdq_item *cmdq_get_callback1(const char *, cmdq_cb, void *);
 struct cmdq_item *cmdq_get_error(const char *);
 struct cmdq_item *cmdq_insert_after(struct cmdq_item *, struct cmdq_item *);
 struct cmdq_item *cmdq_append(struct client *, struct cmdq_item *);
-void            cmdq_insert_hook(struct session *, struct cmdq_item *,
+void printflike(4, 5) cmdq_insert_hook(struct session *, struct cmdq_item *,
                     struct cmd_find_state *, const char *, ...);
 void            cmdq_continue(struct cmdq_item *);
 u_int           cmdq_next(struct client *);
@@ -2398,7 +2398,7 @@ void       file_fire_done(struct client_file *);
 void    file_fire_read(struct client_file *);
 int     file_can_print(struct client *);
 void printflike(2, 3) file_print(struct client *, const char *, ...);
-void    file_vprint(struct client *, const char *, va_list);
+void printflike(2, 0) file_vprint(struct client *, const char *, va_list);
 void    file_print_buffer(struct client *, void *, size_t);
 void printflike(2, 3) file_error(struct client *, const char *, ...);
 void    file_write(struct client *, const char *, int, const void *, size_t,
@@ -2498,7 +2498,8 @@ struct style_range *status_get_range(struct client *, u_int, u_int);
 void    status_init(struct client *);
 void    status_free(struct client *);
 int     status_redraw(struct client *);
-void status_message_set(struct client *, int, int, int, const char *, ...);
+void printflike(5, 6) status_message_set(struct client *, int, int, int,
+            const char *, ...);
 void    status_message_clear(struct client *);
 int     status_message_redraw(struct client *);
 void    status_prompt_set(struct client *, struct cmd_find_state *,
@@ -2653,7 +2654,7 @@ void printflike(3, 4) screen_write_puts(struct screen_write_ctx *,
             const struct grid_cell *, const char *, ...);
 void printflike(4, 5) screen_write_nputs(struct screen_write_ctx *,
             ssize_t, const struct grid_cell *, const char *, ...);
-void    screen_write_vnputs(struct screen_write_ctx *, ssize_t,
+void printflike(4, 0) screen_write_vnputs(struct screen_write_ctx *, ssize_t,
             const struct grid_cell *, const char *, va_list);
 void    screen_write_putc(struct screen_write_ctx *, const struct grid_cell *,
             u_char);
@@ -2922,7 +2923,8 @@ extern const struct window_mode window_client_mode;
 extern const struct window_mode window_copy_mode;
 extern const struct window_mode window_view_mode;
 void printflike(2, 3) window_copy_add(struct window_pane *, const char *, ...);
-void            window_copy_vadd(struct window_pane *, const char *, va_list);
+void printflike(2, 0) window_copy_vadd(struct window_pane *, const char *,
+                    va_list);
 void            window_copy_pageup(struct window_pane *, int);
 void            window_copy_start_drag(struct client *, struct mouse_event *);
 char           *window_copy_get_word(struct window_pane *, u_int, u_int);

diff --git a/usr.bin/tmux/xmalloc.h b/usr.bin/tmux/xmalloc.h
index 570c2e3..a89bd1d 100644 (file)
--- a/usr.bin/tmux/xmalloc.h
+++ b/usr.bin/tmux/xmalloc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: xmalloc.h,v 1.3 2019/11/28 09:51:58 nicm Exp $ */
+/* $OpenBSD: xmalloc.h,v 1.4 2021/08/25 07:09:30 nicm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -30,12 +30,14 @@ int  xasprintf(char **, const char *, ...)
                __attribute__((__format__ (printf, 2, 3)))
                __attribute__((__nonnull__ (2)));
 int     xvasprintf(char **, const char *, va_list)
+               __attribute__((__format__ (printf, 2, 0)))
                __attribute__((__nonnull__ (2)));
 int     xsnprintf(char *, size_t, const char *, ...)
                __attribute__((__format__ (printf, 3, 4)))
                __attribute__((__nonnull__ (3)))
                __attribute__((__bounded__ (__string__, 1, 2)));
 int     xvsnprintf(char *, size_t, const char *, va_list)
+               __attribute__((__format__ (printf, 3, 0)))
                __attribute__((__nonnull__ (3)))
                __attribute__((__bounded__ (__string__, 1, 2)));