diff options
| author | Bruce Momjian <bruce@momjian.us> | 2000-11-16 05:51:07 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2000-11-16 05:51:07 +0000 |
| commit | 312063c97be346c3ce01faff021e9bff0464fa5c (patch) | |
| tree | a4b33aa5242b3e1172379308804f3b06a89857bc /src/backend/utils | |
| parent | 580d2bc60f0e225e3fffc4da81039cf28e249749 (diff) | |
| download | postgresql-312063c97be346c3ce01faff021e9bff0464fa5c.tar.gz postgresql-312063c97be346c3ce01faff021e9bff0464fa5c.zip | |
Make pgsql compile on FreeBSD-alpha.
Context diff this time.
Remove -m486 compile args for FreeBSD-i386, compile -O2 on i386.
Compile with only -O on alpha for codegen safety.
Make the port use the TEST_AND_SET for alpha and i386 on FreeBSD.
Fix a lot of bogus string formats for outputting pointers (cast to int
and %u/%x replaced with no cast and %p), and 'Size'(size_t) are now
cast to 'unsigned long' and output with %lu/
Remove an unused variable.
Alfred Perlstein
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/mmgr/aset.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c index 12affe6731f..b5f552647ef 100644 --- a/src/backend/utils/mmgr/aset.c +++ b/src/backend/utils/mmgr/aset.c @@ -11,7 +11,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.31 2000/07/12 05:15:20 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.32 2000/11/16 05:51:02 momjian Exp $ * * NOTE: * This is a new (Feb. 05, 1999) implementation of the allocation set @@ -876,8 +876,8 @@ AllocSetCheck(MemoryContext context) * Check chunk size */ if (chsize < (1 << ALLOC_MINBITS)) - elog(ERROR, "AllocSetCheck(): %s: bad size '%d' for chunk %p in block %p", - name, chsize, chunk, block); + elog(ERROR, "AllocSetCheck(): %s: bad size '%lu' for chunk %p in block %p", + name, (unsigned long)chsize, chunk, block); /* single-chunk block */ if (chsize >= ALLOC_BIGCHUNK_LIMIT && @@ -891,9 +891,9 @@ AllocSetCheck(MemoryContext context) if (dsize < chsize && *chdata_end != 0x7F) { fprintf(stderr, "\n--- Leak %p ---\n", chdata_end); - fprintf(stderr, "Chunk dump size: %ld (chunk-header %ld + chunk-size: %d), data must be: %d\n--- dump begin ---\n", + fprintf(stderr, "Chunk dump size: %ld (chunk-header %ld + chunk-size: %lu), data must be: %lu\n--- dump begin ---\n", chsize + ALLOC_CHUNKHDRSZ, - ALLOC_CHUNKHDRSZ, chsize, dsize); + ALLOC_CHUNKHDRSZ, (unsigned long)chsize, (unsigned long)dsize); fwrite((void *) chunk, chsize+ALLOC_CHUNKHDRSZ, sizeof(char), stderr); fputs("\n--- dump end ---\n", stderr); @@ -909,9 +909,9 @@ AllocSetCheck(MemoryContext context) *chdata_end != 0x7F) { fprintf(stderr, "\n--- Leak %p ---\n", chdata_end); - fprintf(stderr, "Dump size: %ld (chunk-header %ld + chunk-size: %d + block-freespace: %ld), data must be: %d\n--- dump begin ---\n", + fprintf(stderr, "Dump size: %ld (chunk-header %ld + chunk-size: %lu + block-freespace: %ld), data must be: %lu\n--- dump begin ---\n", chsize + ALLOC_CHUNKHDRSZ + blk_free, - ALLOC_CHUNKHDRSZ, chsize, blk_free, dsize); + ALLOC_CHUNKHDRSZ, (unsigned long)chsize, blk_free, (unsigned long)dsize); fwrite((void *) chunk, chsize+ALLOC_CHUNKHDRSZ+blk_free, sizeof(char), stderr); fputs("\n--- dump end ---\n", stderr); |