Module Name: src
Committed By: jmmv
Date: Wed Aug 17 19:28:37 UTC 2011
Modified Files:
src/external/bsd/tmux/dist: input-keys.c input.c tty-keys.c tty-term.c
window-copy.c
src/external/bsd/tmux/usr.bin/tmux: Makefile
Log Message:
Reenable all warning checks and fix fallover.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/tmux/dist/input-keys.c \
src/external/bsd/tmux/dist/window-copy.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/tmux/dist/input.c \
src/external/bsd/tmux/dist/tty-keys.c \
src/external/bsd/tmux/dist/tty-term.c
cvs rdiff -u -r1.5 -r1.6 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/input-keys.c
diff -u src/external/bsd/tmux/dist/input-keys.c:1.1.1.2 src/external/bsd/tmux/dist/input-keys.c:1.2
--- src/external/bsd/tmux/dist/input-keys.c:1.1.1.2 Wed Aug 17 18:40:04 2011
+++ src/external/bsd/tmux/dist/input-keys.c Wed Aug 17 19:28:36 2011
@@ -1,4 +1,4 @@
-/* $Id: input-keys.c,v 1.1.1.2 2011/08/17 18:40:04 jmmv Exp $ */
+/* $Id: input-keys.c,v 1.2 2011/08/17 19:28:36 jmmv Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <[email protected]>
@@ -207,9 +207,12 @@
if (wp->screen->mode & ALL_MOUSE_MODES) {
if (wp->screen->mode & MODE_MOUSE_UTF8) {
len = xsnprintf(buf, sizeof buf, "\033[M");
- len += utf8_split2(m->b + 32, &buf[len]);
- len += utf8_split2(m->x + 33, &buf[len]);
- len += utf8_split2(m->y + 33, &buf[len]);
+ len += utf8_split2(m->b + 32,
+ (unsigned char *)&buf[len]);
+ len += utf8_split2(m->x + 33,
+ (unsigned char *)&buf[len]);
+ len += utf8_split2(m->y + 33,
+ (unsigned char *)&buf[len]);
} else {
if (m->b > 223 || m->x >= 222 || m->y > 222)
return;
Index: src/external/bsd/tmux/dist/window-copy.c
diff -u src/external/bsd/tmux/dist/window-copy.c:1.1.1.2 src/external/bsd/tmux/dist/window-copy.c:1.2
--- src/external/bsd/tmux/dist/window-copy.c:1.1.1.2 Wed Aug 17 18:40:05 2011
+++ src/external/bsd/tmux/dist/window-copy.c Wed Aug 17 19:28:36 2011
@@ -1,4 +1,4 @@
-/* $Id: window-copy.c,v 1.1.1.2 2011/08/17 18:40:05 jmmv Exp $ */
+/* $Id: window-copy.c,v 1.2 2011/08/17 19:28:36 jmmv Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <[email protected]>
@@ -1344,7 +1344,7 @@
off--; /* remove final \n */
if (options_get_number(&global_options, "set-clipboard"))
- screen_write_setselection(&wp->ictx.ctx, buf, off);
+ screen_write_setselection(&wp->ictx.ctx, (u_char *)buf, off);
/* Add the buffer to the stack. */
limit = options_get_number(&global_options, "buffer-limit");
Index: src/external/bsd/tmux/dist/input.c
diff -u src/external/bsd/tmux/dist/input.c:1.3 src/external/bsd/tmux/dist/input.c:1.4
--- src/external/bsd/tmux/dist/input.c:1.3 Wed Aug 17 18:48:36 2011
+++ src/external/bsd/tmux/dist/input.c Wed Aug 17 19:28:36 2011
@@ -1,4 +1,4 @@
-/* $Id: input.c,v 1.3 2011/08/17 18:48:36 jmmv Exp $ */
+/* $Id: input.c,v 1.4 2011/08/17 19:28:36 jmmv Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <[email protected]>
@@ -1430,7 +1430,7 @@
/* Check for tmux prefix. */
if (ictx->input_len >= prefix_len &&
- strncmp(ictx->input_buf, prefix, prefix_len) == 0) {
+ strncmp((const char *)ictx->input_buf, prefix, prefix_len) == 0) {
screen_write_rawstring(&ictx->ctx,
ictx->input_buf + prefix_len, ictx->input_len - prefix_len);
}
@@ -1470,11 +1470,11 @@
switch (option) {
case 0:
case 2:
- screen_set_title(ictx->ctx.s, p);
+ screen_set_title(ictx->ctx.s, (const char *)p);
server_status_window(ictx->wp->window);
break;
case 12:
- screen_set_cursor_colour(ictx->ctx.s, p);
+ screen_set_cursor_colour(ictx->ctx.s, (const char *)p);
break;
case 112:
if (*p == '\0') /* No arguments allowed. */
Index: src/external/bsd/tmux/dist/tty-keys.c
diff -u src/external/bsd/tmux/dist/tty-keys.c:1.3 src/external/bsd/tmux/dist/tty-keys.c:1.4
--- src/external/bsd/tmux/dist/tty-keys.c:1.3 Wed Aug 17 18:48:36 2011
+++ src/external/bsd/tmux/dist/tty-keys.c Wed Aug 17 19:28:36 2011
@@ -1,4 +1,4 @@
-/* $Id: tty-keys.c,v 1.3 2011/08/17 18:48:36 jmmv Exp $ */
+/* $Id: tty-keys.c,v 1.4 2011/08/17 19:28:36 jmmv Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <[email protected]>
@@ -462,7 +462,7 @@
}
/* Is this a mouse key press? */
- switch (tty_keys_mouse(tty, buf, len, &size, &mouse)) {
+ switch (tty_keys_mouse(tty, (const char *)buf, len, &size, &mouse)) {
case 0: /* yes */
evbuffer_drain(tty->event->input, size);
key = KEYC_MOUSE;
Index: src/external/bsd/tmux/dist/tty-term.c
diff -u src/external/bsd/tmux/dist/tty-term.c:1.3 src/external/bsd/tmux/dist/tty-term.c:1.4
--- src/external/bsd/tmux/dist/tty-term.c:1.3 Wed Aug 17 18:48:36 2011
+++ src/external/bsd/tmux/dist/tty-term.c Wed Aug 17 19:28:36 2011
@@ -1,4 +1,4 @@
-/* $Id: tty-term.c,v 1.3 2011/08/17 18:48:36 jmmv Exp $ */
+/* $Id: tty-term.c,v 1.4 2011/08/17 19:28:36 jmmv Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <[email protected]>
@@ -505,13 +505,13 @@
const char *
tty_term_ptr1(struct tty_term *term, enum tty_code_code code, const void *a)
{
- return (tparm((char *) tty_term_string(term, code), (long)a, 0, 0, 0, 0, 0, 0, 0, 0));
+ return (tparm(tty_term_string(term, code), (long)a, 0, 0, 0, 0, 0, 0, 0, 0));
}
const char *
tty_term_ptr2(struct tty_term *term, enum tty_code_code code, const void *a, const void *b)
{
- return (tparm((char *) tty_term_string(term, code), (long)a, (long)b, 0, 0, 0, 0, 0, 0, 0));
+ return (tparm(tty_term_string(term, code), (long)a, (long)b, 0, 0, 0, 0, 0, 0, 0));
}
int
Index: src/external/bsd/tmux/usr.bin/tmux/Makefile
diff -u src/external/bsd/tmux/usr.bin/tmux/Makefile:1.5 src/external/bsd/tmux/usr.bin/tmux/Makefile:1.6
--- src/external/bsd/tmux/usr.bin/tmux/Makefile:1.5 Wed Aug 17 18:51:10 2011
+++ src/external/bsd/tmux/usr.bin/tmux/Makefile Wed Aug 17 19:28:36 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/08/17 18:51:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2011/08/17 19:28:36 jmmv Exp $
.include <bsd.own.mk>
@@ -11,8 +11,6 @@
MAN= tmux.1
WARNS?= 4
-CWARNFLAGS+= -Wno-cast-qual
-CWARNFLAGS+= -Wno-pointer-sign
SRCS= arguments.c
SRCS+= attributes.c
