Module Name: src
Committed By: dholland
Date: Sat Aug 6 16:34:40 UTC 2011
Modified Files:
src/sbin/dkctl: Makefile dkctl.c
Log Message:
Use explicit cast instead of -Wno-pointer-sign. The site in question is
already marked XXX so there's not much point in whitewashing it.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sbin/dkctl/Makefile
cvs rdiff -u -r1.18 -r1.19 src/sbin/dkctl/dkctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/dkctl/Makefile
diff -u src/sbin/dkctl/Makefile:1.6 src/sbin/dkctl/Makefile:1.7
--- src/sbin/dkctl/Makefile:1.6 Mon Jun 20 07:43:59 2011
+++ src/sbin/dkctl/Makefile Sat Aug 6 16:34:40 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/06/20 07:43:59 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2011/08/06 16:34:40 dholland Exp $
PROG= dkctl
MAN= dkctl.8
@@ -7,7 +7,3 @@
DPADD+= ${LIBUTIL}
.include <bsd.prog.mk>
-
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
-COPTS.dkctl.c+= -Wno-pointer-sign
-.endif
Index: src/sbin/dkctl/dkctl.c
diff -u src/sbin/dkctl/dkctl.c:1.18 src/sbin/dkctl/dkctl.c:1.19
--- src/sbin/dkctl/dkctl.c:1.18 Sun Aug 2 18:16:08 2009
+++ src/sbin/dkctl/dkctl.c Sat Aug 6 16:34:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dkctl.c,v 1.18 2009/08/02 18:16:08 spz Exp $ */
+/* $NetBSD: dkctl.c,v 1.19 2011/08/06 16:34:40 dholland Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: dkctl.c,v 1.18 2009/08/02 18:16:08 spz Exp $");
+__RCSID("$NetBSD: dkctl.c,v 1.19 2011/08/06 16:34:40 dholland Exp $");
#endif
@@ -550,8 +550,8 @@
if (argc != 4)
usage();
- /* XXX Unicode. */
- if (strlcpy(dkw.dkw_wname, argv[0], sizeof(dkw.dkw_wname)) >=
+ /* XXX Unicode: dkw_wname is supposed to be utf-8 */
+ if (strlcpy((char *)dkw.dkw_wname, argv[0], sizeof(dkw.dkw_wname)) >=
sizeof(dkw.dkw_wname))
errx(1, "Wedge name too long; max %zd characters",
sizeof(dkw.dkw_wname) - 1);
