svn commit: r266238 - head/contrib/ldns/ldns

Dag-Erling Smørgrav des at FreeBSD.org
Fri May 16 15:32:17 UTC 2014


Author: des
Date: Fri May 16 15:32:16 2014
New Revision: 266238
URL: http://svnweb.freebsd.org/changeset/base/266238

Log:
  Don't cast away the const qualifier.  Fixes gcc build.

Modified:
  head/contrib/ldns/ldns/util.h
  head/contrib/ldns/ldns/util.h.in

Modified: head/contrib/ldns/ldns/util.h
==============================================================================
--- head/contrib/ldns/ldns/util.h	Fri May 16 15:02:12 2014	(r266237)
+++ head/contrib/ldns/ldns/util.h	Fri May 16 15:32:16 2014	(r266238)
@@ -70,9 +70,9 @@ INLINE uint16_t
 ldns_read_uint16(const void *src)
 {
 #ifdef ALLOW_UNALIGNED_ACCESSES
-	return ntohs(*(uint16_t *) src);
+	return ntohs(*(const uint16_t *) src);
 #else
-	uint8_t *p = (uint8_t *) src;
+	const uint8_t *p = (const uint8_t *) src;
 	return ((uint16_t) p[0] << 8) | (uint16_t) p[1];
 #endif
 }
@@ -81,9 +81,9 @@ INLINE uint32_t
 ldns_read_uint32(const void *src)
 {
 #ifdef ALLOW_UNALIGNED_ACCESSES
-	return ntohl(*(uint32_t *) src);
+	return ntohl(*(const uint32_t *) src);
 #else
-	uint8_t *p = (uint8_t *) src;
+	const uint8_t *p = (const uint8_t *) src;
 	return (  ((uint32_t) p[0] << 24)
 		| ((uint32_t) p[1] << 16)
 		| ((uint32_t) p[2] << 8)

Modified: head/contrib/ldns/ldns/util.h.in
==============================================================================
--- head/contrib/ldns/ldns/util.h.in	Fri May 16 15:02:12 2014	(r266237)
+++ head/contrib/ldns/ldns/util.h.in	Fri May 16 15:32:16 2014	(r266238)
@@ -70,9 +70,9 @@ INLINE uint16_t
 ldns_read_uint16(const void *src)
 {
 #ifdef ALLOW_UNALIGNED_ACCESSES
-	return ntohs(*(uint16_t *) src);
+	return ntohs(*(const uint16_t *) src);
 #else
-	uint8_t *p = (uint8_t *) src;
+	const uint8_t *p = (const uint8_t *) src;
 	return ((uint16_t) p[0] << 8) | (uint16_t) p[1];
 #endif
 }
@@ -81,9 +81,9 @@ INLINE uint32_t
 ldns_read_uint32(const void *src)
 {
 #ifdef ALLOW_UNALIGNED_ACCESSES
-	return ntohl(*(uint32_t *) src);
+	return ntohl(*(const uint32_t *) src);
 #else
-	uint8_t *p = (uint8_t *) src;
+	const uint8_t *p = (const uint8_t *) src;
 	return (  ((uint32_t) p[0] << 24)
 		| ((uint32_t) p[1] << 16)
 		| ((uint32_t) p[2] << 8)


More information about the svn-src-head mailing list