circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-12 03:08:46 +00:00
Code Issues Projects Releases Wiki Activity

Don't use -Wcast-qual and use explicit casts to shut gcc up in the few cases we can't avoid using a char *.

Browse Source
This commit is contained in:
Nicholas Marriott 2009-05-15 12:57:36 +00:00
parent 8913d853e4
commit 0b54a2d723
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GNUmakefile
View File

@ -1,4 +1,4 @@
# $Id: GNUmakefile,v 1.102 2009-05-14 19:32:37 nicm Exp $ # $Id: GNUmakefile,v 1.103 2009-05-15 12:57:36 nicm Exp $
.PHONY: clean .PHONY: clean
@ -25,7 +25,7 @@ CFLAGS+= -g -ggdb -DDEBUG
LIBS+= -ldl LIBS+= -ldl
CFLAGS+= -Wno-long-long -Wall -W -Wnested-externs -Wformat=2 CFLAGS+= -Wno-long-long -Wall -W -Wnested-externs -Wformat=2
CFLAGS+= -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations CFLAGS+= -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
CFLAGS+= -Wwrite-strings -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare CFLAGS+= -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
CFLAGS+= -Wundef -Wbad-function-cast -Winline -Wcast-align CFLAGS+= -Wundef -Wbad-function-cast -Winline -Wcast-align
endif endif

4
Makefile
View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.136 2009-05-14 19:32:37 nicm Exp $ # $Id: Makefile,v 1.137 2009-05-15 12:57:36 nicm Exp $
.SUFFIXES: .c .o .SUFFIXES: .c .o
.PHONY: clean .PHONY: clean
@ -26,7 +26,7 @@ LDFLAGS+= -Wl,-E
CFLAGS+= -g -ggdb -DDEBUG CFLAGS+= -g -ggdb -DDEBUG
CFLAGS+= -Wno-long-long -Wall -W -Wnested-externs -Wformat=2 CFLAGS+= -Wno-long-long -Wall -W -Wnested-externs -Wformat=2
CFLAGS+= -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations CFLAGS+= -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
CFLAGS+= -Wwrite-strings -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare CFLAGS+= -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
CFLAGS+= -Wundef -Wbad-function-cast -Winline -Wcast-align CFLAGS+= -Wundef -Wbad-function-cast -Winline -Wcast-align
.endif .endif

6
options.c
View File

@ -1,4 +1,4 @@
/* $Id: options.c,v 1.4 2009-01-07 19:53:17 nicm Exp $ */ /* $Id: options.c,v 1.5 2009-05-15 12:57:36 nicm Exp $ */
/* /*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@ -63,7 +63,7 @@ options_find1(struct options *oo, const char *name)
{ {
struct options_entry p; struct options_entry p;
p.name = name; p.name = (char *) name;
return (SPLAY_FIND(options_tree, &oo->tree, &p)); return (SPLAY_FIND(options_tree, &oo->tree, &p));
} }
@ -72,7 +72,7 @@ options_find(struct options *oo, const char *name)
{ {
struct options_entry *o, p; struct options_entry *o, p;
p.name = name; p.name = (char *) name;
o = SPLAY_FIND(options_tree, &oo->tree, &p); o = SPLAY_FIND(options_tree, &oo->tree, &p);
while (o == NULL) { while (o == NULL) {
oo = oo->parent; oo = oo->parent;

12
tty-term.c
View File

@ -1,4 +1,4 @@
/* $Id: tty-term.c,v 1.19 2009-05-04 17:58:27 nicm Exp $ */ /* $Id: tty-term.c,v 1.20 2009-05-15 12:57:36 nicm Exp $ */
/* /*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@ -213,21 +213,21 @@ tty_term_find(char *name, int fd, char **cause)
case TTYCODE_NONE: case TTYCODE_NONE:
break; break;
case TTYCODE_STRING: case TTYCODE_STRING:
s = tigetstr(ent->name); s = tigetstr((char *) ent->name);
if (s == NULL || s == (char *) -1) if (s == NULL || s == (char *) -1)
break; break;
code->type = TTYCODE_STRING; code->type = TTYCODE_STRING;
code->value.string = tty_term_strip(s); code->value.string = tty_term_strip(s);
break; break;
case TTYCODE_NUMBER: case TTYCODE_NUMBER:
n = tigetnum(ent->name); n = tigetnum((char *) ent->name);
if (n == -1 || n == -2) if (n == -1 || n == -2)
break; break;
code->type = TTYCODE_NUMBER; code->type = TTYCODE_NUMBER;
code->value.number = n; code->value.number = n;
break; break;
case TTYCODE_FLAG: case TTYCODE_FLAG:
n = tigetflag(ent->name); n = tigetflag((char *) ent->name);
if (n == -1) if (n == -1)
break; break;
code->type = TTYCODE_FLAG; code->type = TTYCODE_FLAG;
@ -362,13 +362,13 @@ tty_term_string(struct tty_term *term, enum tty_code_code code)
const char * const char *
tty_term_string1(struct tty_term *term, enum tty_code_code code, int a) tty_term_string1(struct tty_term *term, enum tty_code_code code, int a)
{ {
return (tparm(tty_term_string(term, code), a)); return (tparm((char *) tty_term_string(term, code), a));
} }
const char * const char *
tty_term_string2(struct tty_term *term, enum tty_code_code code, int a, int b) tty_term_string2(struct tty_term *term, enum tty_code_code code, int a, int b)
{ {
return (tparm(tty_term_string(term, code), a, b)); return (tparm((char *) tty_term_string(term, code), a, b));
} }
int int