kernel: Silence gcc47's -Wcast-qual warnings.

diff --git a/sys/libkern/strtol.c b/sys/libkern/strtol.c
index a6478b7..b1b088a 100644 (file)
--- a/sys/libkern/strtol.c
+++ b/sys/libkern/strtol.c
@@ -124,6 +124,6 @@ strtol(const char *nptr, char **endptr, int base)
        } else if (neg)
                acc = -acc;
        if (endptr != NULL)
-               *((const char **)endptr) = any ? s - 1 : nptr;
+               *((const char **)(void *)endptr) = any ? s - 1 : nptr;
        return (acc);
 }

diff --git a/sys/libkern/strtoq.c b/sys/libkern/strtoq.c
index ae48cfd..3eb480c 100644 (file)
--- a/sys/libkern/strtoq.c
+++ b/sys/libkern/strtoq.c
@@ -128,6 +128,6 @@ strtoq(const char *nptr, char **endptr, int base)
        } else if (neg)
                acc = -acc;
        if (endptr != NULL)
-               *((const char **)endptr) = any ? s - 1 : nptr;
+               *((const char **)(void *)endptr) = any ? s - 1 : nptr;
        return (acc);
 }

diff --git a/sys/libkern/strtoul.c b/sys/libkern/strtoul.c
index 404dedf..8a74824 100644 (file)
--- a/sys/libkern/strtoul.c
+++ b/sys/libkern/strtoul.c
@@ -103,6 +103,6 @@ strtoul(const char *nptr, char **endptr, int base)
        } else if (neg)
                acc = -acc;
        if (endptr != NULL)
-               *((const char **)endptr) = any ? s - 1 : nptr;
+               *((const char **)(void *)endptr) = any ? s - 1 : nptr;
        return (acc);
 }

diff --git a/sys/libkern/strtouq.c b/sys/libkern/strtouq.c
index f56cea5..7f25149 100644 (file)
--- a/sys/libkern/strtouq.c
+++ b/sys/libkern/strtouq.c
@@ -106,6 +106,6 @@ strtouq(const char *nptr, char **endptr, int base)
        } else if (neg)
                acc = -acc;
        if (endptr != NULL)
-               *((const char **)endptr) = any ? s - 1 : nptr;
+               *((const char **)(void *)endptr) = any ? s - 1 : nptr;
        return (acc);
 }

diff --git a/sys/netgraph/netgraph/ng_parse.c b/sys/netgraph/netgraph/ng_parse.c
index dd28d86..1ac0a48 100644 (file)
--- a/sys/netgraph/netgraph/ng_parse.c
+++ b/sys/netgraph/netgraph/ng_parse.c
@@ -975,7 +975,7 @@ ng_bytearray_parse(const struct ng_parse_type *type,
                struct ng_parse_type subtype;
 
                subtype = ng_parse_bytearray_subtype;
-               *(const void **)&subtype.private = type->info;
+               *(const void **)(void *)&subtype.private = type->info;
                return ng_array_parse(&subtype, s, off, start, buf, buflen);
        }
 }
@@ -987,7 +987,7 @@ ng_bytearray_unparse(const struct ng_parse_type *type,
        struct ng_parse_type subtype;
 
        subtype = ng_parse_bytearray_subtype;
-       *(const void **)&subtype.private = type->info;
+       *(const void **)(void *)&subtype.private = type->info;
        return ng_array_unparse(&subtype, data, off, cbuf, cbuflen);
 }
 
@@ -998,7 +998,7 @@ ng_bytearray_getDefault(const struct ng_parse_type *type,
        struct ng_parse_type subtype;
 
        subtype = ng_parse_bytearray_subtype;
-       *(const void **)&subtype.private = type->info;
+       *(const void **)(void *)&subtype.private = type->info;
        return ng_array_getDefault(&subtype, start, buf, buflen);
 }
 

diff --git a/sys/vfs/isofs/cd9660/cd9660_util.c b/sys/vfs/isofs/cd9660/cd9660_util.c
index 71429bf..1f4b967 100644 (file)
--- a/sys/vfs/isofs/cd9660/cd9660_util.c
+++ b/sys/vfs/isofs/cd9660/cd9660_util.c
@@ -73,7 +73,8 @@ isochar(u_char *isofn, u_char *isoend, int joliet_level, u_short *c,
               inbuf[2]='\0';
               inp = inbuf;
               outp = outbuf;
-              cd9660_iconv->convchr(handle, (const char **)&inp, &i, &outp, &j);
+              cd9660_iconv->convchr(handle, (const char **)(void *)&inp,
+                 &i, &outp, &j);
               len -= j;
               if (clen) *clen = len;
               *c = '\0';

diff --git a/sys/vfs/msdosfs/msdosfs_conv.c b/sys/vfs/msdosfs/msdosfs_conv.c
index 9ceb354..e6a87c5 100644 (file)
--- a/sys/vfs/msdosfs/msdosfs_conv.c
+++ b/sys/vfs/msdosfs/msdosfs_conv.c
@@ -519,8 +519,8 @@ dos2unixfn(u_char dn[11], u_char *un, int lower, struct msdosfsmount *pmp)
         * Copy the name portion into the unix filename string.
          */
        for(i  = 8; i > 0 && *dn != ' ';) {
-                c = dos2unixchr((const u_char **)&dn, &i, lower & LCASE_BASE,
-                    pmp);
+                c = dos2unixchr((const u_char **)(void *)&dn,
+                   &i, lower & LCASE_BASE, pmp);
                 if (c & 0xff00) {
                         *un++ = c >> 8;
                         thislong++;
@@ -538,7 +538,7 @@ dos2unixfn(u_char dn[11], u_char *un, int lower, struct msdosfsmount *pmp)
                 *un++ = '.';
                 thislong++;
                 for (i = 3; i > 0 && *dn != ' ';) {
-                        c = dos2unixchr((const u_char **)&dn, &i,
+                        c = dos2unixchr((const u_char **)(void *)&dn, &i,
                             lower & LCASE_EXT, pmp);
                         if (c & 0xff00) {
                                 *un++ = c >> 8;
@@ -1013,7 +1013,8 @@ winChkName(struct mbnambuf *nbp, const u_char *un, size_t unlen, int chksum,
                  * 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((const u_char **)(void *)&np,
+                   &len, LCASE_BASE, pmp);
                 c2 = unix2winchr(&un, &unlen, LCASE_BASE, pmp);
                 if (c1 != c2)
                         return -2;

diff --git a/sys/vfs/ntfs/ntfs_subr.c b/sys/vfs/ntfs/ntfs_subr.c
index a61cd4e..b8d8eae 100644 (file)
--- a/sys/vfs/ntfs/ntfs_subr.c
+++ b/sys/vfs/ntfs/ntfs_subr.c
@@ -2049,8 +2049,8 @@ ntfs_u28(struct ntfsmount *ntmp, wchar wc)
                inbuf[2] = '\0';
                p = inbuf;
                outp = outbuf;
-               ntfs_iconv->convchr(ntmp->ntm_ic_u2l, (const char **)&p, &ilen,
-                                   &outp, &olen);
+               ntfs_iconv->convchr(ntmp->ntm_ic_u2l,
+                   (const char **)(void *)&p, &ilen, &outp, &olen);
                if (olen == 1) {
                        return ((wchar)(outbuf[0]&0xFF));
                } else if (olen == 0) {
@@ -2083,8 +2083,8 @@ ntfs_82u(struct ntfsmount *ntmp,
                inbuf[2] = '\0';
                p = inbuf;
                outp = outbuf;
-               ntfs_iconv->convchr(ntmp->ntm_ic_l2u, (const char **)&p, &ilen,
-                                   &outp, &olen);
+               ntfs_iconv->convchr(ntmp->ntm_ic_l2u,
+                   (const char **)(void *)&p, &ilen, &outp, &olen);
                *len -= (int)ilen;
                uc = (wchar)((outbuf[0]<<8) | (outbuf[1]&0xFF));