Module Name: src
Committed By: christos
Date: Sun Aug 14 13:27:47 UTC 2011
Modified Files:
src/usr.bin/sdpquery: Makefile print.c sdpquery.c
Log Message:
kill gcc-4.5 warnings
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/sdpquery/Makefile
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/sdpquery/print.c
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/sdpquery/sdpquery.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/sdpquery/Makefile
diff -u src/usr.bin/sdpquery/Makefile:1.7 src/usr.bin/sdpquery/Makefile:1.8
--- src/usr.bin/sdpquery/Makefile:1.7 Tue Jun 21 22:49:44 2011
+++ src/usr.bin/sdpquery/Makefile Sun Aug 14 09:27:47 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/06/22 02:49:44 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2011/08/14 13:27:47 christos Exp $
USE_FORT?= yes # network client
@@ -10,9 +10,3 @@
LDADD+= -lbluetooth
.include <bsd.prog.mk>
-
-# XXX
-.if ${HAVE_GCC} == 45
-COPTS.sdpquery.c+= -Wno-error
-COPTS.print.c+= -Wno-error
-.endif
Index: src/usr.bin/sdpquery/print.c
diff -u src/usr.bin/sdpquery/print.c:1.16 src/usr.bin/sdpquery/print.c:1.17
--- src/usr.bin/sdpquery/print.c:1.16 Thu Jul 7 06:49:38 2011
+++ src/usr.bin/sdpquery/print.c Sun Aug 14 09:27:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.16 2011/07/07 10:49:38 plunky Exp $ */
+/* $NetBSD: print.c,v 1.17 2011/08/14 13:27:47 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: print.c,v 1.16 2011/07/07 10:49:38 plunky Exp $");
+__RCSID("$NetBSD: print.c,v 1.17 2011/08/14 13:27:47 christos Exp $");
#include <ctype.h>
#include <iconv.h>
@@ -848,7 +848,7 @@
return;
}
- n = iconv(ih, (const char **)&src, &srcleft, &dst, &dstleft);
+ n = iconv(ih, (void *)&src, &srcleft, &dst, &dstleft);
iconv_close(ih);
Index: src/usr.bin/sdpquery/sdpquery.c
diff -u src/usr.bin/sdpquery/sdpquery.c:1.5 src/usr.bin/sdpquery/sdpquery.c:1.6
--- src/usr.bin/sdpquery/sdpquery.c:1.5 Tue May 12 14:37:50 2009
+++ src/usr.bin/sdpquery/sdpquery.c Sun Aug 14 09:27:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sdpquery.c,v 1.5 2009/05/12 18:37:50 plunky Exp $ */
+/* $NetBSD: sdpquery.c,v 1.6 2011/08/14 13:27:47 christos Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -35,7 +35,7 @@
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc.\
Copyright (c) 2006 Itronix, Inc.\
All rights reserved.");
-__RCSID("$NetBSD: sdpquery.c,v 1.5 2009/05/12 18:37:50 plunky Exp $");
+__RCSID("$NetBSD: sdpquery.c,v 1.6 2011/08/14 13:27:47 christos Exp $");
#include <bluetooth.h>
#include <err.h>
@@ -142,7 +142,7 @@
for (cmd = commands ; cmd->command != NULL; cmd++) {
if (strcasecmp(*argv, cmd->command) == 0)
- return (*cmd->handler)(--argc, (char const **)++argv);
+ return (*cmd->handler)(--argc, (void *)++argv);
}
usage();
