r18027: Fix some 64-bit warnings

(This used to be commit cd495d89314a653b5976b1690e075fd7bac2f59b)

diff --git a/source4/lib/talloc/talloc.c b/source4/lib/talloc/talloc.c
index b7284e9317bc52be702aab1331c2931d284a5ab2..43c95a86e53f03d898fca6e7d464545feaee2a51 100644 (file)
--- a/source4/lib/talloc/talloc.c
+++ b/source4/lib/talloc/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/source4/lib/talloc/testsuite.c b/source4/lib/talloc/testsuite.c
index ca5e9042d349ce5130fb5677d9a4fed9ca4a30d7..8640e9475eadf84092be564582f2b0961a45f185 100644 (file)
--- a/source4/lib/talloc/testsuite.c
+++ b/source4/lib/talloc/testsuite.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;
        }