1299. [port] Darwin uses (unsigned long) for size_t. [RT #2590]

diff --git a/CHANGES b/CHANGES
index f7fc6b6019ee999a6e0bc15b932ff0ca95ceacff..dd5d5a1e8880071f14f664c0b6294b15de99579e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1299.  [port]          Darwin uses (unsigned long) for size_t. [RT #2590]
+
 1298.  [func]          dig: now supports +[no]cl +[no]ttlid.
 
 1297.  [func]          You can now create your own customised printing

diff --git a/bin/tests/names/t_names.c b/bin/tests/names/t_names.c
index 5ae3bf86b5158d7df8b0c837bb683a58d79cc7cf..a629fdd0cd14fc36de0c0ee106575a8c81da8589 100644 (file)
--- a/bin/tests/names/t_names.c
+++ b/bin/tests/names/t_names.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_names.c,v 1.32 2001/01/09 21:42:02 bwelling Exp $ */
+/* $Id: t_names.c,v 1.33 2002/05/23 04:32:22 marka Exp $ */
 
 #include <config.h>
 
@@ -157,15 +157,15 @@ chkdata(unsigned char *buf, size_t buflen, char *exp_data,
                if (cnt == exp_data_len)
                        result = 0;
                else {
-                       t_info("bad data at position %d, "
+                       t_info("bad data at position %lu, "
                               "got 0x%.2x, expected 0x%.2x\n",
-                              cnt, *p, *q);
+                              (unsigned long)cnt, *p, *q);
                        result = cnt + 1;
                }
                (void)free(data);
        } else {
-               t_info("data length error, expected %d, got %d\n",
-                       exp_data_len, buflen);
+               t_info("data length error, expected %lu, got %lu\n",
+                       (unsigned long)exp_data_len, (unsigned long)buflen);
                result = exp_data_len - buflen;
        }
        return (result);

diff --git a/bin/tests/system/lwresd/lwtest.c b/bin/tests/system/lwresd/lwtest.c
index 706dd580ae21d4946079c792ca413bf7d7f6854a..7dc8c4387ba539a00328b2360a15cb1fea854e77 100644 (file)
--- a/bin/tests/system/lwresd/lwtest.c
+++ b/bin/tests/system/lwresd/lwtest.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwtest.c,v 1.22 2001/02/05 23:09:05 bwelling Exp $ */
+/* $Id: lwtest.c,v 1.23 2002/05/23 04:32:24 marka Exp $ */
 
 #include <config.h>
 
@@ -500,8 +500,9 @@ test_getaddrinfo(const char *name, int af, int v4ok, int v6ok,
                        char outbuf[16];
                        (void)inet_ntop(af, ai->ai_addr,
                                        outbuf, sizeof(outbuf));
-                       printf("I:getaddrinfo(%s) returned %db, "
-                              "expected %db\n", name, ai->ai_addrlen, len);
+                       printf("I:getaddrinfo(%s) returned %lub, "
+                              "expected %ub\n", name,
+                               (unsigned long)ai->ai_addrlen, len);
                        fails++;
                        freeaddrinfo(ai);
                        return;

diff --git a/lib/dns/cache.c b/lib/dns/cache.c
index 3f739973b5de8ff17f1b7d5f61cf4210997bddc0..376d86fe7736d663f7e4511c7aaa3ee97f036873 100644 (file)
--- a/lib/dns/cache.c
+++ b/lib/dns/cache.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cache.c,v 1.52 2001/11/30 01:59:05 gson Exp $ */
+/* $Id: cache.c,v 1.53 2002/05/23 04:32:28 marka Exp $ */
 
 #include <config.h>
 
@@ -619,8 +619,8 @@ begin_cleaning(cache_cleaner_t *cleaner) {
 
                isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
                              DNS_LOGMODULE_CACHE, ISC_LOG_DEBUG(1),
-                             "begin cache cleaning, mem inuse %d",
-                             isc_mem_inuse(cleaner->cache->mctx));
+                             "begin cache cleaning, mem inuse %lu",
+                           (unsigned long)isc_mem_inuse(cleaner->cache->mctx));
                cleaner->state = cleaner_s_busy;
                isc_task_send(cleaner->task, &cleaner->resched_event);
        }
@@ -639,8 +639,8 @@ end_cleaning(cache_cleaner_t *cleaner, isc_event_t *event) {
                                      cleaner->cleaning_interval);
 
        isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_CACHE,
-                     ISC_LOG_DEBUG(1), "end cache cleaning, mem inuse %d",
-                     isc_mem_inuse(cleaner->cache->mctx));
+                     ISC_LOG_DEBUG(1), "end cache cleaning, mem inuse %lu",
+                     (unsigned long)isc_mem_inuse(cleaner->cache->mctx));
 
        cleaner->state = cleaner_s_idle;
        cleaner->resched_event = event;
@@ -809,8 +809,8 @@ incremental_cleaning_action(isc_task_t *task, isc_event_t *event) {
 
        isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_CACHE,
                      ISC_LOG_DEBUG(1), "cache cleaner: checked %d nodes, "
-                     "mem inuse %d, sleeping",
-                     cleaner->increment, isc_mem_inuse(cleaner->cache->mctx));
+                     "mem inuse %lu, sleeping", cleaner->increment,
+                     (unsigned long)isc_mem_inuse(cleaner->cache->mctx));
 
        isc_task_send(task, &event);
        INSIST(CLEANER_BUSY(cleaner));

diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index f26755230fc3378468181397b8800f2d4aba1d06..12021682b4f73c451213a8ad0625dd98eddedcb5 100644 (file)
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mem.c,v 1.112 2002/03/19 02:40:16 marka Exp $ */
+/* $Id: mem.c,v 1.113 2002/05/23 04:32:30 marka Exp $ */
 
 #include <config.h>
 
@@ -1041,7 +1041,8 @@ isc__mem_get(isc_mem_t *ctx, size_t size FLARG) {
                ctx->maxinuse = ctx->inuse;
                if (ctx->hi_water != 0 && ctx->inuse > ctx->hi_water &&
                    (isc_mem_debugging & ISC_MEM_DEBUGUSAGE) != 0)
-                       fprintf(stderr, "maxinuse = %d\n", ctx->inuse);
+                       fprintf(stderr, "maxinuse = %lu\n",
+                               (unsigned long)ctx->inuse);
        }
        UNLOCK(&ctx->lock);