[src/trunk]: src/usr.bin/sdpquery kill gcc-4.5 warnings

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fe40d4a64d9f
branches:  trunk
changeset: 768323:fe40d4a64d9f
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Aug 14 13:27:47 2011 +0000

description:
kill gcc-4.5 warnings

diffstat:

 usr.bin/sdpquery/Makefile   |  8 +-------
 usr.bin/sdpquery/print.c    |  6 +++---
 usr.bin/sdpquery/sdpquery.c |  6 +++---
 3 files changed, 7 insertions(+), 13 deletions(-)

diffs (73 lines):

diff -r ac5d226bb67f -r fe40d4a64d9f usr.bin/sdpquery/Makefile
--- a/usr.bin/sdpquery/Makefile Sun Aug 14 13:26:23 2011 +0000
+++ b/usr.bin/sdpquery/Makefile Sun Aug 14 13:27:47 2011 +0000
@@ -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
diff -r ac5d226bb67f -r fe40d4a64d9f usr.bin/sdpquery/print.c
--- a/usr.bin/sdpquery/print.c  Sun Aug 14 13:26:23 2011 +0000
+++ b/usr.bin/sdpquery/print.c  Sun Aug 14 13:27:47 2011 +0000
@@ -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);
 
diff -r ac5d226bb67f -r fe40d4a64d9f usr.bin/sdpquery/sdpquery.c
--- a/usr.bin/sdpquery/sdpquery.c       Sun Aug 14 13:26:23 2011 +0000
+++ b/usr.bin/sdpquery/sdpquery.c       Sun Aug 14 13:27:47 2011 +0000
@@ -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();