Date: Mon, 2 Feb 2015 08:05:13 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r278063 - in stable: 10/sys/libkern 9/sys/libkern Message-ID: <201502020805.t1285Drt018045@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Mon Feb 2 08:05:11 2015 New Revision: 278063 URL: https://svnweb.freebsd.org/changeset/base/278063 Log: MFC r277901: Fix a -Wcast-qual warning in libkern's strtol(), by using __DECONST. No functional change. MFC r277903: Similar to r277901, fix more -Wcast-qual warnings in libkern's strtoq(), strtoul() and strtouq(), by using __DECONST. No functional change. Modified: stable/10/sys/libkern/strtol.c stable/10/sys/libkern/strtoq.c stable/10/sys/libkern/strtoul.c stable/10/sys/libkern/strtouq.c Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/9/sys/libkern/strtol.c stable/9/sys/libkern/strtoq.c stable/9/sys/libkern/strtoul.c stable/9/sys/libkern/strtouq.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/10/sys/libkern/strtol.c ============================================================================== --- stable/10/sys/libkern/strtol.c Mon Feb 2 08:04:38 2015 (r278062) +++ stable/10/sys/libkern/strtol.c Mon Feb 2 08:05:11 2015 (r278063) @@ -124,6 +124,6 @@ strtol(nptr, endptr, base) } else if (neg) acc = -acc; if (endptr != 0) - *((const char **)endptr) = any ? s - 1 : nptr; + *endptr = __DECONST(char *, any ? s - 1 : nptr); return (acc); } Modified: stable/10/sys/libkern/strtoq.c ============================================================================== --- stable/10/sys/libkern/strtoq.c Mon Feb 2 08:04:38 2015 (r278062) +++ stable/10/sys/libkern/strtoq.c Mon Feb 2 08:05:11 2015 (r278063) @@ -125,6 +125,6 @@ strtoq(const char *nptr, char **endptr, } else if (neg) acc = -acc; if (endptr != 0) - *((const char **)endptr) = any ? s - 1 : nptr; + *endptr = __DECONST(char *, any ? s - 1 : nptr); return (acc); } Modified: stable/10/sys/libkern/strtoul.c ============================================================================== --- stable/10/sys/libkern/strtoul.c Mon Feb 2 08:04:38 2015 (r278062) +++ stable/10/sys/libkern/strtoul.c Mon Feb 2 08:05:11 2015 (r278063) @@ -103,6 +103,6 @@ strtoul(nptr, endptr, base) } else if (neg) acc = -acc; if (endptr != 0) - *((const char **)endptr) = any ? s - 1 : nptr; + *endptr = __DECONST(char *, any ? s - 1 : nptr); return (acc); } Modified: stable/10/sys/libkern/strtouq.c ============================================================================== --- stable/10/sys/libkern/strtouq.c Mon Feb 2 08:04:38 2015 (r278062) +++ stable/10/sys/libkern/strtouq.c Mon Feb 2 08:05:11 2015 (r278063) @@ -102,6 +102,6 @@ strtouq(const char *nptr, char **endptr, } else if (neg) acc = -acc; if (endptr != 0) - *((const char **)endptr) = any ? s - 1 : nptr; + *endptr = __DECONST(char *, any ? s - 1 : nptr); return (acc); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502020805.t1285Drt018045>