diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2009-05-15 12:57:36 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2009-05-15 12:57:36 +0000 |
| commit | 0b54a2d72374ec3ad73f7b2c8b666f8ec2411f54 (patch) | |
| tree | 5cd3f4d17e8415517e764b01ff87446184d74953 | |
| parent | 8913d853e45735442c3b59a7b608525f980eed68 (diff) | |
| download | rtmux-0b54a2d72374ec3ad73f7b2c8b666f8ec2411f54.tar.gz rtmux-0b54a2d72374ec3ad73f7b2c8b666f8ec2411f54.tar.bz2 rtmux-0b54a2d72374ec3ad73f7b2c8b666f8ec2411f54.zip | |
Don't use -Wcast-qual and use explicit casts to shut gcc up in the few cases we can't avoid using a char *.
| -rw-r--r-- | GNUmakefile | 4 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | options.c | 6 | ||||
| -rw-r--r-- | tty-term.c | 12 |
4 files changed, 13 insertions, 13 deletions
diff --git a/GNUmakefile b/GNUmakefile index 47097879..bdbcaa94 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -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 @@ -25,7 +25,7 @@ CFLAGS+= -g -ggdb -DDEBUG LIBS+= -ldl CFLAGS+= -Wno-long-long -Wall -W -Wnested-externs -Wformat=2 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 endif @@ -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 .PHONY: clean @@ -26,7 +26,7 @@ LDFLAGS+= -Wl,-E CFLAGS+= -g -ggdb -DDEBUG CFLAGS+= -Wno-long-long -Wall -W -Wnested-externs -Wformat=2 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 .endif @@ -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> @@ -63,7 +63,7 @@ options_find1(struct options *oo, const char *name) { struct options_entry p; - p.name = name; + p.name = (char *) name; 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; - p.name = name; + p.name = (char *) name; o = SPLAY_FIND(options_tree, &oo->tree, &p); while (o == NULL) { oo = oo->parent; @@ -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> @@ -213,21 +213,21 @@ tty_term_find(char *name, int fd, char **cause) case TTYCODE_NONE: break; case TTYCODE_STRING: - s = tigetstr(ent->name); + s = tigetstr((char *) ent->name); if (s == NULL || s == (char *) -1) break; code->type = TTYCODE_STRING; code->value.string = tty_term_strip(s); break; case TTYCODE_NUMBER: - n = tigetnum(ent->name); + n = tigetnum((char *) ent->name); if (n == -1 || n == -2) break; code->type = TTYCODE_NUMBER; code->value.number = n; break; case TTYCODE_FLAG: - n = tigetflag(ent->name); + n = tigetflag((char *) ent->name); if (n == -1) break; code->type = TTYCODE_FLAG; @@ -362,13 +362,13 @@ tty_term_string(struct tty_term *term, enum tty_code_code code) const char * 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 * 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 |