svn commit: r278060 - in stable: 10/sys/fs/cd9660 9/sys/fs/cd9660

[Dimitry Andric]

Author: dim
Date: Mon Feb  2 07:42:03 2015
New Revision: 278060
URL: https://svnweb.freebsd.org/changeset/base/278060

Log:
  MFC r277899:
  
  Fix a bunch of -Wcast-qual warnings in cd9660_util.c, by using
  __DECONST.  No functional change.

Modified:
  stable/9/sys/fs/cd9660/cd9660_util.c
Directory Properties:
  stable/9/sys/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/sys/fs/cd9660/cd9660_util.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/9/sys/fs/cd9660/cd9660_util.c
==============================================================================
--- stable/9/sys/fs/cd9660/cd9660_util.c	Mon Feb  2 07:37:25 2015	(r278059)
+++ stable/9/sys/fs/cd9660/cd9660_util.c	Mon Feb  2 07:42:03 2015	(r278060)
@@ -80,7 +80,8 @@ isochar(isofn, isoend, joliet_level, c, 
               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, jolie
 	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);