Module Name: src
Committed By: christos
Date: Fri Aug 19 09:06:05 UTC 2011
Modified Files:
src/external/bsd/tmux/dist: cmd-display-message.c tmux.h
src/external/bsd/tmux/usr.bin/tmux: Makefile
Log Message:
document/fix non-literal format strings.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/tmux/dist/cmd-display-message.c \
src/external/bsd/tmux/dist/tmux.h
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/tmux/usr.bin/tmux/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/tmux/dist/cmd-display-message.c
diff -u src/external/bsd/tmux/dist/cmd-display-message.c:1.1.1.2 src/external/bsd/tmux/dist/cmd-display-message.c:1.2
--- src/external/bsd/tmux/dist/cmd-display-message.c:1.1.1.2 Wed Aug 17 14:40:04 2011
+++ src/external/bsd/tmux/dist/cmd-display-message.c Fri Aug 19 05:06:05 2011
@@ -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 <[email protected]>
@@ -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];
Index: src/external/bsd/tmux/dist/tmux.h
diff -u src/external/bsd/tmux/dist/tmux.h:1.1.1.2 src/external/bsd/tmux/dist/tmux.h:1.2
--- src/external/bsd/tmux/dist/tmux.h:1.1.1.2 Wed Aug 17 14:40:06 2011
+++ src/external/bsd/tmux/dist/tmux.h Fri Aug 19 05:06:05 2011
@@ -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 <[email protected]>
@@ -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 *);
Index: src/external/bsd/tmux/usr.bin/tmux/Makefile
diff -u src/external/bsd/tmux/usr.bin/tmux/Makefile:1.7 src/external/bsd/tmux/usr.bin/tmux/Makefile:1.8
--- src/external/bsd/tmux/usr.bin/tmux/Makefile:1.7 Thu Aug 18 15:05:54 2011
+++ src/external/bsd/tmux/usr.bin/tmux/Makefile Fri Aug 19 05:06:05 2011
@@ -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>
