ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

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

Browse Source
This commit is contained in:
Mark Andrews
2002-05-23 04:32:30 +00:00
parent a2734fa74a
commit acc8b7ac3d
5 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -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

10
bin/tests/names/t_names.c
View File

@@ -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);

7
bin/tests/system/lwresd/lwtest.c
View File

@@ -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;

14
lib/dns/cache.c
View File

@@ -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));

5
lib/isc/mem.c
View File

@@ -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);