svn commit: r277898 - head/sys/fs/msdosfs

[Dimitry Andric]

Author: dim
Date: Thu Jan 29 20:30:13 2015
New Revision: 277898
URL: https://svnweb.freebsd.org/changeset/base/277898

Log:
  Fix a bunch of -Wcast-qual warnings in msdosfs_conv.c, by using
  __DECONST.  No functional change.
  
  MFC after:	3 days

Modified:
  head/sys/fs/msdosfs/msdosfs_conv.c

Modified: head/sys/fs/msdosfs/msdosfs_conv.c
==============================================================================
--- head/sys/fs/msdosfs/msdosfs_conv.c	Thu Jan 29 19:55:33 2015	(r277897)
+++ head/sys/fs/msdosfs/msdosfs_conv.c	Thu Jan 29 20:30:13 2015	(r277898)
@@ -253,7 +253,7 @@ dos2unixfn(u_char dn[11], u_char *un, in
 	 * Copy the name portion into the unix filename string.
 	 */
 	for (i = 8; i > 0 && *dn != ' ';) {
-		c = dos2unixchr(tmpbuf, (const u_char **)&dn, &i,
+		c = dos2unixchr(tmpbuf, __DECONST(const u_char **, &dn), &i,
 		    lower & LCASE_BASE, pmp);
 		while (*c != '\0') {
 			*un++ = *c++;
@@ -270,8 +270,8 @@ dos2unixfn(u_char dn[11], u_char *un, in
 		*un++ = '.';
 		thislong++;
 		for (i = 3; i > 0 && *dn != ' ';) {
-			c = dos2unixchr(tmpbuf, (const u_char **)&dn, &i,
-			    lower & LCASE_EXT, pmp);
+			c = dos2unixchr(tmpbuf, __DECONST(const u_char **, &dn),
+			    &i, lower & LCASE_EXT, pmp);
 			while (*c != '\0') {
 				*un++ = *c++;
 				thislong++;
@@ -612,7 +612,8 @@ winChkName(struct mbnambuf *nbp, const u
 		 * to look up or create files in case sensitive even when
 		 * it's a long file name.
 		 */
-		c1 = unix2winchr((const u_char **)&np, &len, LCASE_BASE, pmp);
+		c1 = unix2winchr(__DECONST(const u_char **, &np), &len,
+		    LCASE_BASE, pmp);
 		c2 = unix2winchr(&un, &unlen, LCASE_BASE, pmp);
 		if (c1 != c2)
 			return -2;
@@ -922,8 +923,8 @@ win2unixchr(u_char *outbuf, u_int16_t wc
 		ilen = 2;
 		olen = len = 4;
 		inp = inbuf;
-		msdosfs_iconv->convchr(pmp->pm_w2u, (const char **)&inp, &ilen,
-				     (char **)&outp, &olen);
+		msdosfs_iconv->convchr(pmp->pm_w2u, __DECONST(const char **,
+		    &inp), &ilen, (char **)&outp, &olen);
 		len -= olen;
 
 		/*