mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up compile errors and warnings, cf Billy Allie's

Browse Source 
complaints (and some of my own).
This commit is contained in:
Tom Lane 1999-04-02 04:51:05 +00:00
parent b5b5852c26
commit 0b874f01dd
3 changed files with 9 additions and 10 deletions
src
backend
commands
vacuum.c
storage/ipc
shmem.c
include/storage
shmem.h

13
src/backend/commands/vacuum.c

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.97 1999/03/28 20:32:01 vadim Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.98 1999/04/02 04:51:04 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -66,7 +66,6 @@ static Portal vc_portal;
static int MESSAGE_LEVEL; /* message level */ static int MESSAGE_LEVEL; /* message level */
static TransactionId XmaxRecent; static TransactionId XmaxRecent;
extern void GetXmaxRecent(TransactionId *xid);
#define swapLong(a,b) {long tmp; tmp=a; a=b; b=tmp;} #define swapLong(a,b) {long tmp; tmp=a; a=b; b=tmp;}
#define swapInt(a,b) {int tmp; tmp=a; a=b; b=tmp;} #define swapInt(a,b) {int tmp; tmp=a; a=b; b=tmp;}
@ -2421,16 +2420,16 @@ vc_find_eq(void *bot, int nelem, int size, void *elm,
} }
if (last_move == true) if (last_move == true)
{ {
res = compar(elm, bot + last * size); res = compar(elm, (void *)((char *)bot + last * size));
if (res > 0) if (res > 0)
return NULL; return NULL;
if (res == 0) if (res == 0)
return bot + last * size; return (void *)((char *)bot + last * size);
last_move = false; last_move = false;
} }
res = compar(elm, bot + celm * size); res = compar(elm, (void *)((char *)bot + celm * size));
if (res == 0) if (res == 0)
return bot + celm * size; return (void *)((char *)bot + celm * size);
if (res < 0) if (res < 0)
{ {
if (celm == 0) if (celm == 0)
@ -2445,7 +2444,7 @@ vc_find_eq(void *bot, int nelem, int size, void *elm,
return NULL; return NULL;
last = last - celm - 1; last = last - celm - 1;
bot = bot + (celm + 1) * size; bot = (void *)((char *)bot + (celm + 1) * size);
celm = (last + 1) / 2; celm = (last + 1) / 2;
first_move = true; first_move = true;
} }

3
src/backend/storage/ipc/shmem.c

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.38 1999/03/28 20:32:22 vadim Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.39 1999/04/02 04:51:03 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -737,5 +737,4 @@ GetXmaxRecent(TransactionId *XmaxRecent)
SpinRelease(ShmemIndexLock); SpinRelease(ShmemIndexLock);
elog(ERROR, "GetXmaxRecent: ShmemIndex corrupted"); elog(ERROR, "GetXmaxRecent: ShmemIndex corrupted");
return NULL;
} }

3
src/include/storage/shmem.h

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: shmem.h,v 1.15 1999/02/13 23:22:10 momjian Exp $ * $Id: shmem.h,v 1.16 1999/04/02 04:51:05 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -71,6 +71,7 @@ extern SHMEM_OFFSET ShmemPIDDestroy(int pid);
extern long *ShmemInitStruct(char *name, unsigned long size, extern long *ShmemInitStruct(char *name, unsigned long size,
bool *foundPtr); bool *foundPtr);
extern bool TransactionIdIsInProgress(TransactionId xid); extern bool TransactionIdIsInProgress(TransactionId xid);
extern void GetXmaxRecent(TransactionId *XmaxRecent);
typedef int TableID; typedef int TableID;