summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2015-02-02 07:42:03 +0000
committerdim <dim@FreeBSD.org>2015-02-02 07:42:03 +0000
commitc01327573ebfe4c07f76e97b8f4579d4b70d5869 (patch)
tree2633ddaf57ec202c9d9a60f941378c3b5269366e
parent3541d65302ad7e116a10fcef8842c21f39519639 (diff)
downloadFreeBSD-src-c01327573ebfe4c07f76e97b8f4579d4b70d5869.zip
FreeBSD-src-c01327573ebfe4c07f76e97b8f4579d4b70d5869.tar.gz
MFC r277899:
Fix a bunch of -Wcast-qual warnings in cd9660_util.c, by using __DECONST. No functional change.
-rw-r--r--sys/fs/cd9660/cd9660_util.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/fs/cd9660/cd9660_util.c b/sys/fs/cd9660/cd9660_util.c
index 5372c75..fdce1da 100644
--- a/sys/fs/cd9660/cd9660_util.c
+++ b/sys/fs/cd9660/cd9660_util.c
@@ -80,7 +80,8 @@ isochar(isofn, isoend, joliet_level, c, clen, flags, handle)
inbuf[2]='\0';
inp = inbuf;
outp = outbuf;
- cd9660_iconv->convchr(handle, (const char **)&inp, &i, &outp, &j);
+ cd9660_iconv->convchr(handle, __DECONST(const char **, &inp), &i,
+ &outp, &j);
len -= j;
if (clen) *clen = len;
*c = '\0';
@@ -121,7 +122,8 @@ isofncmp(fn, fnlen, isofn, isolen, joliet_level, flags, handle, lhandle)
u_char *fnend = fn + fnlen, *isoend = isofn + isolen;
for (; fn < fnend; ) {
- d = sgetrune(fn, fnend - fn, (char const **)&fn, flags, lhandle);
+ d = sgetrune(fn, fnend - fn, __DECONST(const char **, &fn),
+ flags, lhandle);
if (isofn == isoend)
return d;
isofn += isochar(isofn, isoend, joliet_level, &c, NULL, flags, handle);
OpenPOWER on IntegriCloud