5 files changed, 15 insertions, 21 deletions
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index 04c1f4813d..c1040cfc16 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.50 1999/03/28 20:32:17 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.51 1999/05/10 00:45:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1828,7 +1828,7 @@ _bm_die(Oid dbId, Oid relId, int blkNo, int bufNo,
 		tb = &TraceBuf[i];
 		if (tb->bmt_op != BMT_NOTUSED)
 		{
-			fprintf(fp, "     [%3d]%spid %d buf %2d for <%d,%d,%d> ",
+			fprintf(fp, "     [%3d]%spid %d buf %2d for <%d,%u,%d> ",
 					i, (i == cur ? " ---> " : "\t"),
 					tb->bmt_pid, tb->bmt_buf,
 					tb->bmt_dbid, tb->bmt_relid, tb->bmt_blkno);
@@ -1859,7 +1859,7 @@ _bm_die(Oid dbId, Oid relId, int blkNo, int bufNo,
 	}
 
 	fprintf(fp, "\noperation causing error:\n");
-	fprintf(fp, "\tpid %d buf %d for <%d,%d,%d> ",
+	fprintf(fp, "\tpid %d buf %d for <%d,%u,%d> ",
 			getpid(), bufNo, dbId, relId, blkNo);
 
 	switch (allocType)
diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c
index 81c16d36e9..c9fcf506bc 100644
--- a/src/backend/storage/buffer/localbuf.c
+++ b/src/backend/storage/buffer/localbuf.c
@@ -15,7 +15,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.21 1999/02/13 23:18:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.22 1999/05/10 00:45:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -81,7 +81,7 @@ LocalBufferAlloc(Relation reln, BlockNumber blockNum, bool *foundPtr)
 		{
 
 #ifdef LBDEBUG
-			fprintf(stderr, "LB ALLOC (%d,%d) %d\n",
+			fprintf(stderr, "LB ALLOC (%u,%d) %d\n",
 					RelationGetRelid(reln), blockNum, -i - 1);
 #endif
 			LocalRefCount[i]++;
@@ -91,7 +91,7 @@ LocalBufferAlloc(Relation reln, BlockNumber blockNum, bool *foundPtr)
 	}
 
 #ifdef LBDEBUG
-	fprintf(stderr, "LB ALLOC (%d,%d) %d\n",
+	fprintf(stderr, "LB ALLOC (%u,%d) %d\n",
 			RelationGetRelid(reln), blockNum, -nextFreeLocalBuf - 1);
 #endif
 
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
index c5dcea61ae..4e5ab146bb 100644
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.17 1999/02/19 06:06:03 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.18 1999/05/10 00:45:37 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -145,8 +145,7 @@ SIAssignBackendId(SISeg *segInOutP, BackendTag backendTag)
 	{
 		if (segInOutP->procState[index].tag == backendTag)
 		{
-			elog(FATAL, "SIAssignBackendId: tag %d found twice",
-				 backendTag);
+			elog(FATAL, "SIAssignBackendId: tag %d found twice", backendTag);
 		}
 	}
 
@@ -155,15 +154,10 @@ SIAssignBackendId(SISeg *segInOutP, BackendTag backendTag)
 	if (stateP->tag != InvalidBackendTag)
 	{
 		if (stateP->tag == backendTag)
-		{
-			elog(NOTICE, "SIAssignBackendId: reusing tag %d",
-				 backendTag);
-		}
+			elog(NOTICE, "SIAssignBackendId: reusing tag %d", backendTag);
 		else
 		{
-			elog(NOTICE,
-				 "SIAssignBackendId: discarding tag %d",
-				 stateP->tag);
+			elog(NOTICE, "SIAssignBackendId: discarding tag %d", stateP->tag);
 			return InvalidBackendTag;
 		}
 	}
diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index a56214356a..79df2912b9 100644
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.51 1999/03/14 16:08:17 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.52 1999/05/10 00:45:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -119,8 +119,8 @@ inv_create(int flags)
 	file_oid = newoid() + 1;
 
 	/* come up with some table names */
-	sprintf(objname, "xinv%d", file_oid);
-	sprintf(indname, "xinx%d", file_oid);
+	sprintf(objname, "xinv%u", file_oid);
+	sprintf(indname, "xinx%u", file_oid);
 
 	if (RelnameFindRelid(objname) != InvalidOid)
 	{
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index c1996fe071..6c3437837d 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.50 1999/05/07 01:23:03 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.51 1999/05/10 00:45:43 momjian Exp $
  *
  * NOTES
  *	  Outside modules can create a lock table and acquire/release
@@ -83,7 +83,7 @@ static int WaitOnLock(LOCKMETHOD lockmethod, LOCK *lock, LOCKMODE lockmode);
 
 #define LOCK_PRINT_AUX(where,lock,type) \
 	TPRINTF(TRACE_ALL, \
-		 "%s: lock(%x) tbl(%d) rel(%d) db(%d) obj(%u) mask(%x) " \
+		 "%s: lock(%x) tbl(%d) rel(%u) db(%d) obj(%u) mask(%x) " \
 		 "hold(%d,%d,%d,%d,%d)=%d " \
 		 "act(%d,%d,%d,%d,%d)=%d wait(%d) type(%s)", \
 		 where, \