[src/trunk]: src/external/bsd/tmux document/fix non-literal format strings.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/66b3022519b2
branches:  trunk
changeset: 768550:66b3022519b2
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Aug 19 09:06:05 2011 +0000

description:
document/fix non-literal format strings.

diffstat:

 external/bsd/tmux/dist/cmd-display-message.c |  4 ++--
 external/bsd/tmux/dist/tmux.h                |  5 +++--
 external/bsd/tmux/usr.bin/tmux/Makefile      |  7 ++++++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diffs (56 lines):

diff -r 965c4e60142f -r 66b3022519b2 external/bsd/tmux/dist/cmd-display-message.c
--- a/external/bsd/tmux/dist/cmd-display-message.c      Fri Aug 19 08:35:40 2011 +0000
+++ b/external/bsd/tmux/dist/cmd-display-message.c      Fri Aug 19 09:06:05 2011 +0000
@@ -1,4 +1,4 @@
-/* $Id: cmd-display-message.c,v 1.1.1.2 2011/08/17 18:40:04 jmmv Exp $ */
+/* $Id: cmd-display-message.c,v 1.2 2011/08/19 09:06:05 christos Exp $ */
 
 /*
  * Copyright (c) 2009 Tiago Cunha <me%tiagocunha.org@localhost>
@@ -63,7 +63,7 @@
        }
 
        if (args->argc == 0)
-               template = "[#S] #I:#W, current pane #P - (%H:%M %d-%b-%y)";
+               template = "[#S] #I:#W, current pane #P - (%H:%M %d-%b-%Y)";
        else
                template = args->argv[0];
 
diff -r 965c4e60142f -r 66b3022519b2 external/bsd/tmux/dist/tmux.h
--- a/external/bsd/tmux/dist/tmux.h     Fri Aug 19 08:35:40 2011 +0000
+++ b/external/bsd/tmux/dist/tmux.h     Fri Aug 19 09:06:05 2011 +0000
@@ -1,4 +1,4 @@
-/* $Id: tmux.h,v 1.1.1.2 2011/08/17 18:40:06 jmmv Exp $ */
+/* $Id: tmux.h,v 1.2 2011/08/19 09:06:05 christos Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm%users.sourceforge.net@localhost>
@@ -1696,7 +1696,8 @@
 void    status_set_window_at(struct client *, u_int);
 int     status_redraw(struct client *);
 char   *status_replace(struct client *, struct session *,
-            struct winlink *, struct window_pane *, const char *, time_t, int);
+            struct winlink *, struct window_pane *, const char *, time_t, int)
+    __attribute__((__format__(__strftime__, 5, 0)));
 void printflike2 status_message_set(struct client *, const char *, ...);
 void    status_message_clear(struct client *);
 int     status_message_redraw(struct client *);
diff -r 965c4e60142f -r 66b3022519b2 external/bsd/tmux/usr.bin/tmux/Makefile
--- a/external/bsd/tmux/usr.bin/tmux/Makefile   Fri Aug 19 08:35:40 2011 +0000
+++ b/external/bsd/tmux/usr.bin/tmux/Makefile   Fri Aug 19 09:06:05 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/08/18 19:05:54 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2011/08/19 09:06:05 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -209,4 +209,9 @@
 LDADD+=                -levent -lterminfo -lutil -lm
 DPADD+=                ${LIBEVENT} ${LIBTERMINFO} ${LIBUTIL}
 
+COPTS.cmd-display-message.c += -Wno-format-nonliteral
+COPTS.cmd-pipe-pane.c += -Wno-format-nonliteral
+COPTS.server-client.c += -Wno-format-nonliteral
+COPTS.status.c += -Wno-format-nonliteral
+
 .include <bsd.prog.mk>