From: Volker Lendecke <vlendec@samba.org>
Date: Mon, 4 Sep 2006 08:55:58 +0000 (+0000)
Subject: r18027: Fix some 64-bit warnings
X-Git-Tag: samba-4.0.0alpha6~801^2~7730
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f2b59622ea1d2ca72577e3c7f60c5868a2aa20a;p=thirdparty%2Fsamba.git

r18027: Fix some 64-bit warnings
(This used to be commit 54706285f7394e458b6481d0285f67ed225ea34e)
---

diff --git a/source3/lib/talloc.c b/source3/lib/talloc.c
index b7284e9317b..43c95a86e53 100644
--- a/source3/lib/talloc.c
+++ b/source3/lib/talloc.c
@@ -890,7 +890,7 @@ static void talloc_report_depth_FILE_helper(const void *ptr, int depth, int max_
 		name,
 		(unsigned long)talloc_total_size(ptr),
 		(unsigned long)talloc_total_blocks(ptr),
-		talloc_reference_count(ptr));
+		(int)talloc_reference_count(ptr));
 }
 
 /*
diff --git a/source3/lib/talloctort.c b/source3/lib/talloctort.c
index ca5e9042d34..8640e9475ea 100644
--- a/source3/lib/talloctort.c
+++ b/source3/lib/talloctort.c
@@ -960,8 +960,10 @@ static BOOL test_talloc_ptrtype(void)
 	s1 = talloc_ptrtype(top, s1);location1 = __location__;
 
 	if (talloc_get_size(s1) != sizeof(struct struct1)) {
-		printf("%s: talloc_ptrtype() allocated the wrong size %u (should be %u)\n",
-			__location__, talloc_get_size(s1), sizeof(struct struct1));
+		printf("%s: talloc_ptrtype() allocated the wrong size %lu "
+		       "(should be %lu)\n",
+			__location__, (unsigned long)talloc_get_size(s1),
+		       (unsigned long)sizeof(struct struct1));
 		ret = False;
 	}
 
@@ -974,22 +976,27 @@ static BOOL test_talloc_ptrtype(void)
 	s2 = talloc_array_ptrtype(top, s2, 10);location2 = __location__;
 
 	if (talloc_get_size(s2) != (sizeof(struct struct1) * 10)) {
-		printf("%s: talloc_array_ptrtype() allocated the wrong size %u (should be %u)\n",
-			__location__, talloc_get_size(s2), (sizeof(struct struct1)*10));
+		printf("%s: talloc_array_ptrtype() allocated the wrong size "
+		       "%lu (should be %lu)\n",
+			__location__, (unsigned long)talloc_get_size(s2),
+		       (unsigned long)(sizeof(struct struct1)*10));
 		ret = False;
 	}
 
 	if (strcmp(location2, talloc_get_name(s2)) != 0) {
 		printf("%s: talloc_array_ptrtype() sets the wrong name '%s' (should be '%s')\n",
-			__location__, talloc_get_name(s2), location2);
+			__location__, talloc_get_name(s2),
+		       location2);
 		ret = False;
 	}
 
 	s3 = talloc_array_ptrtype(top, s3, 10);location3 = __location__;
 
 	if (talloc_get_size(s3) != (sizeof(struct struct1 *) * 10)) {
-		printf("%s: talloc_array_ptrtype() allocated the wrong size %u (should be %u)\n",
-			__location__, talloc_get_size(s3), (sizeof(struct struct1 *)*10));
+		printf("%s: talloc_array_ptrtype() allocated the wrong size "
+		       "%lu (should be %lu)\n",
+			__location__, (unsigned long)talloc_get_size(s3),
+		       (unsigned long)(sizeof(struct struct1 *)*10));
 		ret = False;
 	}
 
@@ -1002,8 +1009,10 @@ static BOOL test_talloc_ptrtype(void)
 	s4 = talloc_array_ptrtype(top, s4, 10);location4 = __location__;
 
 	if (talloc_get_size(s4) != (sizeof(struct struct1 **) * 10)) {
-		printf("%s: talloc_array_ptrtype() allocated the wrong size %u (should be %u)\n",
-			__location__, talloc_get_size(s4), (sizeof(struct struct1 **)*10));
+		printf("%s: talloc_array_ptrtype() allocated the wrong size "
+		       "%lu (should be %lu)\n",
+			__location__, (unsigned long)talloc_get_size(s4),
+		       (unsigned long)(sizeof(struct struct1 **)*10));
 		ret = False;
 	}