diff options
Diffstat (limited to 'src/backend/storage')
-rw-r--r-- | src/backend/storage/buffer/freelist.c | 7 | ||||
-rw-r--r-- | src/backend/storage/buffer/localbuf.c | 9 | ||||
-rw-r--r-- | src/backend/storage/ipc/ipc.c | 6 | ||||
-rw-r--r-- | src/backend/storage/ipc/s_lock.c | 10 | ||||
-rw-r--r-- | src/backend/storage/ipc/shmem.c | 4 | ||||
-rw-r--r-- | src/backend/storage/ipc/sinval.c | 4 | ||||
-rw-r--r-- | src/backend/storage/large_object/inv_api.c | 7 |
7 files changed, 25 insertions, 22 deletions
diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c index 747d551ed0a..7e1d5d7654d 100644 --- a/src/backend/storage/buffer/freelist.c +++ b/src/backend/storage/buffer/freelist.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.2 1996/11/03 04:57:02 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.3 1996/11/10 03:02:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -257,11 +257,12 @@ DBG_FreeListCheck(int nfree) } } +#ifdef NOT_USED /* * PrintBufferFreeList - * prints the buffer free list, for debugging */ -void +static void PrintBufferFreeList() { BufferDesc *buf; @@ -285,3 +286,5 @@ PrintBufferFreeList() buf = &(BufferDescriptors[buf->freeNext]); } } + +#endif diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c index b79f23ecd75..30943e68b38 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.3 1996/11/08 05:58:16 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.4 1996/11/10 03:02:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -38,6 +38,7 @@ #include "storage/spin.h" #include "storage/smgr.h" #include "storage/lmgr.h" +#include "storage/buf_internals.h" #include "miscadmin.h" #include "utils/builtins.h" #include "utils/hsearch.h" @@ -205,7 +206,7 @@ FlushLocalBuffer(Buffer buffer) * buffer until we need it. */ void -InitLocalBuffer() +InitLocalBuffer(void) { int i; @@ -241,7 +242,7 @@ InitLocalBuffer() * we will not need these buffers again. */ void -LocalBufferSync() +LocalBufferSync(void) { int i; @@ -269,7 +270,7 @@ LocalBufferSync() } void -ResetLocalBufferPool() +ResetLocalBufferPool(void) { int i; diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c index c512cbef1a4..9f74d848c47 100644 --- a/src/backend/storage/ipc/ipc.c +++ b/src/backend/storage/ipc/ipc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.8 1996/11/08 05:58:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.9 1996/11/10 03:02:21 momjian Exp $ * * NOTES * @@ -66,7 +66,7 @@ static struct ONEXIT { } onexit_list[ MAX_ON_EXITS ]; static int onexit_index; -static void IpcConfigTip(); +static void IpcConfigTip(void); typedef struct _PrivateMemStruct { int id; @@ -725,7 +725,7 @@ LockIsFree(int lockid) #endif /* HAS_TEST_AND_SET */ static void -IpcConfigTip() +IpcConfigTip(void) { fprintf(stderr,"This type of error is usually caused by improper\n"); fprintf(stderr,"shared memory or System V IPC semaphore configuration.\n"); diff --git a/src/backend/storage/ipc/s_lock.c b/src/backend/storage/ipc/s_lock.c index 3c8f8c14eb2..76e4ea7cc68 100644 --- a/src/backend/storage/ipc/s_lock.c +++ b/src/backend/storage/ipc/s_lock.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.7 1996/11/06 06:49:04 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.8 1996/11/10 03:02:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -48,6 +48,8 @@ #if defined(HAS_TEST_AND_SET) +extern int tas(slock_t *lock); + #if defined (next) /* * NEXTSTEP (mach) @@ -163,9 +165,7 @@ S_LOCK_FREE(slock_t *lock) #if defined(i386_solaris) || \ defined(sparc_solaris) - /* for xxxxx_solaris, this is defined in port/.../tas.s */ -extern int tas(slock_t *lock); void S_LOCK(slock_t *lock) @@ -227,9 +227,6 @@ S_INIT_LOCK(slock_t *lock) #if defined(hpux) -/* defined in port/.../tas.s */ -extern int tas(slock_t *lock); - /* * a "set" slock_t has a single word cleared. a "clear" slock_t has * all words set to non-zero. @@ -389,6 +386,7 @@ S_INIT_LOCK(unsigned char *addr) defined(bsdi_2_1) || \ defined(linux) + int tas(slock_t *m) { diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c index 42a5ba38636..4a3ad33e9b6 100644 --- a/src/backend/storage/ipc/shmem.c +++ b/src/backend/storage/ipc/shmem.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.5 1996/11/08 20:45:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.6 1996/11/10 03:02:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -98,7 +98,7 @@ static HTAB *BindingTable = NULL; * ---------------------- */ void -ShmemBindingTabReset() +ShmemBindingTabReset(void) { BindingTable = (HTAB *)NULL; } diff --git a/src/backend/storage/ipc/sinval.c b/src/backend/storage/ipc/sinval.c index 8ea1643049e..bd4079efd67 100644 --- a/src/backend/storage/ipc/sinval.c +++ b/src/backend/storage/ipc/sinval.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.4 1996/11/06 06:49:09 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.5 1996/11/10 03:02:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -75,7 +75,7 @@ AttachSharedInvalidationState(IPCKey key) } void -InitSharedInvalidationState() +InitSharedInvalidationState(void) { SpinAcquire(SInvalLock); if (!SIBackendInit(shmInvalBuffer)) diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c index bde4c41b341..bb649996010 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.5 1996/11/08 05:58:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.6 1996/11/10 03:02:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -61,8 +61,9 @@ #define IMINBLK 512 /* non-export function prototypes */ -static HeapTuple inv_fetchtup(); -static HeapTuple inv_newtuple(); +static HeapTuple inv_newtuple(LargeObjectDesc *obj_desc, Buffer buffer, + Page page, char *dbuf, int nwrite); +static HeapTuple inv_fetchtup(LargeObjectDesc *obj_desc, Buffer *bufP); static int inv_wrnew(LargeObjectDesc *obj_desc, char *buf, int nbytes); static int inv_wrold(LargeObjectDesc *obj_desc, char *dbuf, int nbytes, HeapTuple htup, Buffer buffer); |