From: Mark Andrews <marka@isc.org>
Date: Tue, 18 Jun 2013 21:00:07 +0000 (+1000)
Subject: pass correct type off_t
X-Git-Tag: v9.10.0a1~269
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=77fa1a27dd44a242ead161458b7b1bc0be926ce9;p=thirdparty%2Fbind9.git

pass correct type off_t
---

diff --git a/lib/dns/tests/rbt_test.c b/lib/dns/tests/rbt_test.c
index 2ab2425c489..83f88c5d6f3 100644
--- a/lib/dns/tests/rbt_test.c
+++ b/lib/dns/tests/rbt_test.c
@@ -129,7 +129,7 @@ write_data(FILE *file, unsigned char *datap, void *arg, isc_uint64_t *crc) {
 	temp = *data;
 	temp.data = (data->len == 0
 		     ? NULL
-		     : (char *)(where + sizeof(data_holder_t)));
+		     : (char *)((uintptr_t)where + sizeof(data_holder_t)));
 
 	isc_crc64_update(crc, (void *)&temp, sizeof(temp));
 	ret = fwrite(&temp, sizeof(data_holder_t), 1, file);
@@ -314,7 +314,7 @@ ATF_TC_BODY(serialize, tc) {
 	isc_result_t result;
 	FILE *rbtfile = NULL;
 	dns_rbt_t *rbt_deserialized = NULL;
-	long offset;
+	off_t offset;
 	int fd;
 	off_t filesize = 0;
 	char *base;
@@ -386,7 +386,7 @@ ATF_TC_BODY(deserialize_corrupt, tc) {
 	dns_rbt_t *rbt = NULL;
 	isc_result_t result;
 	FILE *rbtfile = NULL;
-	long offset;
+	off_t offset;
 	int fd;
 	off_t filesize = 0;
 	char *base, *p, *q;