dtc: Enable and fix -Wpointer-arith warnings

This patch turns on the -Wpointer-arith option in the dtc Makefile,
and fixes the resulting warnings due to using (void *) in pointer
arithmetic.  While convenient, pointer arithmetic on void * is not
portable, so it's better that we avoid it, particularly in libfdt.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>

5 files changed, 13 insertions, 13 deletions

diff --git a/tests/incbin.c b/tests/incbin.c
index 2f8a55a..5ab3508 100644
--- a/tests/incbin.c
+++ b/tests/incbin.c
@@ -31,10 +31,10 @@
 
 #define CHUNKSIZE	1024
 
-void *load_file(const char *name, int *len)
+char *load_file(const char *name, int *len)
 {
 	FILE *f;
-	void *buf = NULL;
+	char *buf = NULL;
 	int bufsize = 0, n;
 
 	*len = 0;
@@ -60,7 +60,8 @@ void *load_file(const char *name, int *len)
 
 int main(int argc, char *argv[])
 {
-	void *fdt, *incbin;
+	void *fdt;
+	char *incbin;
 	int len;
 
 	test_init(argc, argv);
diff --git a/tests/mangle-layout.c b/tests/mangle-layout.c
index efd6aab..bd6ac40 100644
--- a/tests/mangle-layout.c
+++ b/tests/mangle-layout.c
@@ -31,7 +31,7 @@
 #include "testdata.h"
 
 struct bufstate {
-	void *buf;
+	char *buf;
 	int size;
 };
 
@@ -73,7 +73,7 @@ void add_block(struct bufstate *buf, int version, char block, const void *fdt)
 	case 'm':
 		/* Memory reserve map */
 		align = 8;
-		src = fdt + fdt_off_mem_rsvmap(fdt);
+		src = (const char *)fdt + fdt_off_mem_rsvmap(fdt);
 		size = (fdt_num_mem_rsv(fdt) + 1)
 			* sizeof(struct fdt_reserve_entry);
 		break;
@@ -81,14 +81,14 @@ void add_block(struct bufstate *buf, int version, char block, const void *fdt)
 	case 't':
 		/* Structure block */
 		align = 4;
-		src = fdt + fdt_off_dt_struct(fdt);
+		src = (const char *)fdt + fdt_off_dt_struct(fdt);
 		size = fdt_size_dt_struct(fdt);
 		break;
 
 	case 's':
 		/* Strings block */
 		align = 1;
-		src = fdt + fdt_off_dt_strings(fdt);
+		src = (const char *)fdt + fdt_off_dt_strings(fdt);
 		size = fdt_size_dt_strings(fdt);
 		break;
 	default:
diff --git a/tests/move_and_save.c b/tests/move_and_save.c
index da73157..410ccb3 100644
--- a/tests/move_and_save.c
+++ b/tests/move_and_save.c
@@ -33,7 +33,7 @@
 int main(int argc, char *argv[])
 {
 	void *fdt, *fdt1, *fdt2, *fdt3;
-	void *buf;
+	char *buf;
 	int shuntsize;
 	int bufsize;
 	int err;
diff --git a/tests/nopulate.c b/tests/nopulate.c
index 923ba2d..e56839a 100644
--- a/tests/nopulate.c
+++ b/tests/nopulate.c
@@ -30,7 +30,7 @@
 #include "tests.h"
 #include "testdata.h"
 
-int nopulate_struct(char *buf, const void *fdt)
+int nopulate_struct(char *buf, const char *fdt)
 {
 	int offset, nextoffset = 0;
 	uint32_t tag;
@@ -42,7 +42,7 @@ int nopulate_struct(char *buf, const void *fdt)
 		offset = nextoffset;
 		tag = fdt_next_tag(fdt, offset, &nextoffset);
 
-		memcpy(p, fdt + fdt_off_dt_struct(fdt) + offset,
+		memcpy(p, (const char *)fdt + fdt_off_dt_struct(fdt) + offset,
 		       nextoffset - offset);
 		p += nextoffset - offset;
 
@@ -56,8 +56,7 @@ int nopulate_struct(char *buf, const void *fdt)
 
 int main(int argc, char *argv[])
 {
-	void *fdt, *fdt2;
-	void *buf;
+	char *fdt, *fdt2, *buf;
 	int newsize, struct_start, struct_end_old, struct_end_new, delta;
 	const char *inname;
 	char outname[PATH_MAX];
diff --git a/tests/testutils.c b/tests/testutils.c
index b4a3d90..b0a2230 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -200,7 +200,7 @@ void save_blob(const char *filename, void *fdt)
 	int fd;
 	int totalsize;
 	int offset;
-	void *p;
+	char *p;
 	int ret;
 
 	fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0666);