Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 29 Jan 2015 21:54:02 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r277903 - head/sys/libkern
Message-ID:  <201501292154.t0TLs2Nw062949@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: dim
Date: Thu Jan 29 21:54:01 2015
New Revision: 277903
URL: https://svnweb.freebsd.org/changeset/base/277903

Log:
  Similar to r277901, fix more -Wcast-qual warnings in libkern's strtoq(),
  strtoul() and strtouq(), by using __DECONST.  No functional change.
  
  MFC after:	3 days

Modified:
  head/sys/libkern/strtoq.c
  head/sys/libkern/strtoul.c
  head/sys/libkern/strtouq.c

Modified: head/sys/libkern/strtoq.c
==============================================================================
--- head/sys/libkern/strtoq.c	Thu Jan 29 21:31:29 2015	(r277902)
+++ head/sys/libkern/strtoq.c	Thu Jan 29 21:54:01 2015	(r277903)
@@ -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: head/sys/libkern/strtoul.c
==============================================================================
--- head/sys/libkern/strtoul.c	Thu Jan 29 21:31:29 2015	(r277902)
+++ head/sys/libkern/strtoul.c	Thu Jan 29 21:54:01 2015	(r277903)
@@ -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: head/sys/libkern/strtouq.c
==============================================================================
--- head/sys/libkern/strtouq.c	Thu Jan 29 21:31:29 2015	(r277902)
+++ head/sys/libkern/strtouq.c	Thu Jan 29 21:54:01 2015	(r277903)
@@ -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?201501292154.t0TLs2Nw062949>