Improve clarity of some casts;

from Christos Zoulas <christos at NetBSD>.

2 files changed, 9 insertions, 9 deletions

diff --git a/dba.c b/dba.c
index bb1539b7..ee43933d 100644
--- a/dba.c
+++ b/dba.c
@@ -1,4 +1,4 @@
-/*	$Id: dba.c,v 1.9 2017/01/15 15:28:55 schwarze Exp $ */
+/*	$Id: dba.c,v 1.10 2017/02/17 14:43:54 schwarze Exp $ */
 /*
  * Copyright (c) 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -315,8 +315,8 @@ compare_names(const void *vp1, const void *vp2)
 	const char	*cp1, *cp2;
 	int		 diff;
 
-	cp1 = *(char **)vp1;
-	cp2 = *(char **)vp2;
+	cp1 = *(const char * const *)vp1;
+	cp2 = *(const char * const *)vp2;
 	return (diff = *cp2 - *cp1) ? diff :
 	    strcasecmp(cp1 + 1, cp2 + 1);
 }
@@ -326,8 +326,8 @@ compare_strings(const void *vp1, const void *vp2)
 {
 	const char	*cp1, *cp2;
 
-	cp1 = *(char **)vp1;
-	cp2 = *(char **)vp2;
+	cp1 = *(const char * const *)vp1;
+	cp2 = *(const char * const *)vp2;
 	return strcmp(cp1, cp2);
 }
 
@@ -502,7 +502,7 @@ compare_entries(const void *vp1, const void *vp2)
 {
 	const struct macro_entry *ep1, *ep2;
 
-	ep1 = *(struct macro_entry **)vp1;
-	ep2 = *(struct macro_entry **)vp2;
+	ep1 = *(const struct macro_entry * const *)vp1;
+	ep2 = *(const struct macro_entry * const *)vp2;
 	return strcmp(ep1->value, ep2->value);
 }
diff --git a/dbm_map.c b/dbm_map.c
index d158302b..87c085d2 100644
--- a/dbm_map.c
+++ b/dbm_map.c
@@ -1,4 +1,4 @@
-/*	$Id: dbm_map.c,v 1.7 2016/10/22 10:09:27 schwarze Exp $ */
+/*	$Id: dbm_map.c,v 1.8 2017/02/17 14:43:54 schwarze Exp $ */
 /*
  * Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -175,7 +175,7 @@ dbm_getint(int32_t offset)
 int32_t
 dbm_addr(const void *p)
 {
-	return htobe32((char *)p - dbm_base);
+	return htobe32((const char *)p - dbm_base);
 }
 
 int