Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian1996-11-10 03:06:38 +0000
committerBruce Momjian1996-11-10 03:06:38 +0000
commitaaeef4d17db9ded501fa02c9ca6c00f86258b171 (patch)
tree7f27c0c7519886eda3b9ddd6fe1eb4a9d628dacb /src/backend
parentbf5cbbf7895aa16b2e18dbe29462a4fd8baf4293 (diff)
All external function definitions now have prototypes that are checked.
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/access/common/heaptuple.c3
-rw-r--r--src/backend/access/common/heapvalid.c3
-rw-r--r--src/backend/access/common/indexvalid.c3
-rw-r--r--src/backend/access/common/printtup.c3
-rw-r--r--src/backend/access/gist/gist.c25
-rw-r--r--src/backend/access/gist/gistscan.c1
-rw-r--r--src/backend/access/hash/hashfunc.c4
-rw-r--r--src/backend/access/heap/stats.c4
-rw-r--r--src/backend/access/nbtree/nbtcompare.c3
-rw-r--r--src/backend/access/rtree/rtproc.c3
-rw-r--r--src/backend/access/transam/transam.c6
-rw-r--r--src/backend/access/transam/xact.c12
-rw-r--r--src/backend/access/transam/xid.c3
-rw-r--r--src/backend/catalog/catalog.c4
-rw-r--r--src/backend/catalog/heap.c32
-rw-r--r--src/backend/commands/copy.c3
-rw-r--r--src/backend/commands/define.c10
-rw-r--r--src/backend/commands/rename.c3
-rw-r--r--src/backend/commands/view.c3
-rw-r--r--src/backend/executor/execUtils.c4
-rw-r--r--src/backend/executor/nodeMergejoin.c4
-rw-r--r--src/backend/executor/nodeTee.c4
-rw-r--r--src/backend/lib/dllist.c4
-rw-r--r--src/backend/libpq/be-dumpdata.c10
-rw-r--r--src/backend/libpq/hba.c4
-rw-r--r--src/backend/nodes/equalfuncs.c5
-rw-r--r--src/backend/nodes/outfuncs.c4
-rw-r--r--src/backend/nodes/print.c4
-rw-r--r--src/backend/nodes/readfuncs.c4
-rw-r--r--src/backend/optimizer/path/allpaths.c6
-rw-r--r--src/backend/optimizer/util/joininfo.c3
-rw-r--r--src/backend/parser/analyze.c5
-rw-r--r--src/backend/parser/catalog_utils.c12
-rw-r--r--src/backend/parser/parser.c5
-rw-r--r--src/backend/postmaster/postmaster.c4
-rw-r--r--src/backend/rewrite/locks.c4
-rw-r--r--src/backend/rewrite/rewriteDefine.c3
-rw-r--r--src/backend/rewrite/rewriteManip.c3
-rw-r--r--src/backend/storage/buffer/freelist.c7
-rw-r--r--src/backend/storage/buffer/localbuf.c9
-rw-r--r--src/backend/storage/ipc/ipc.c6
-rw-r--r--src/backend/storage/ipc/s_lock.c10
-rw-r--r--src/backend/storage/ipc/shmem.c4
-rw-r--r--src/backend/storage/ipc/sinval.c4
-rw-r--r--src/backend/storage/large_object/inv_api.c7
-rw-r--r--src/backend/tcop/dest.c10
-rw-r--r--src/backend/tcop/postgres.c9
-rw-r--r--src/backend/tcop/pquery.c4
-rw-r--r--src/backend/utils/adt/acl.c4
-rw-r--r--src/backend/utils/adt/arrayutils.c4
-rw-r--r--src/backend/utils/adt/date.c4
-rw-r--r--src/backend/utils/adt/datetimes.c20
-rw-r--r--src/backend/utils/adt/geo-selfuncs.c3
-rw-r--r--src/backend/utils/adt/like.c4
-rw-r--r--src/backend/utils/adt/varchar.c6
-rw-r--r--src/backend/utils/cache/fcache.c3
-rw-r--r--src/backend/utils/cache/relcache.c8
-rw-r--r--src/backend/utils/error/elog.c4
-rw-r--r--src/backend/utils/error/exc.c4
-rw-r--r--src/backend/utils/hash/dynahash.c8
-rw-r--r--src/backend/utils/mmgr/aset.c4
61 files changed, 179 insertions, 187 deletions
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index f33a269736e..b516e5beaba 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.15 1996/11/05 07:42:40 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.16 1996/11/10 02:56:41 momjian Exp $
*
* NOTES
* The old interface functions have been converted to macros
@@ -19,6 +19,7 @@
#include <postgres.h>
+#include <access/heapam.h>
#include <access/htup.h>
#include <access/transam.h>
#include <access/tupmacs.h>
diff --git a/src/backend/access/common/heapvalid.c b/src/backend/access/common/heapvalid.c
index f4aceefb340..fdf333092fb 100644
--- a/src/backend/access/common/heapvalid.c
+++ b/src/backend/access/common/heapvalid.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.11 1996/11/05 07:42:41 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.12 1996/11/10 02:56:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,6 +16,7 @@
#include <fmgr.h>
#include <access/heaptuple.h>
+#include <access/valid.h>
#include <access/xact.h>
#include <storage/bufpage.h>
#include <utils/rel.h>
diff --git a/src/backend/access/common/indexvalid.c b/src/backend/access/common/indexvalid.c
index 5314804d791..ae40807b845 100644
--- a/src/backend/access/common/indexvalid.c
+++ b/src/backend/access/common/indexvalid.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.11 1996/11/05 07:42:43 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.12 1996/11/10 02:56:51 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,6 +15,7 @@
#include <postgres.h>
#include <access/htup.h>
+#include <access/iqual.h>
#include <access/itup.h>
#include <access/skey.h>
#include <executor/execdebug.h>
diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c
index edfa7715579..f536d8c751e 100644
--- a/src/backend/access/common/printtup.c
+++ b/src/backend/access/common/printtup.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.11 1996/11/05 07:42:44 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.12 1996/11/10 02:57:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,6 +17,7 @@
#include <fmgr.h>
#include <access/heaptuple.h>
+#include <access/printtup.h>
#include <catalog/pg_type.h>
#include <libpq/libpq.h>
#include <utils/syscache.h>
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index fa29a961773..7fbf0ef07d3 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -1190,9 +1190,6 @@ gistcentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr, Relation r,
#ifdef GISTDEBUG
-extern char *text_range_out();
-extern char *int_range_out();
-
/*
** sloppy debugging support routine, requires recompilation with appropriate
** "out" method for the index keys. Could be fixed to find that info
@@ -1236,7 +1233,7 @@ _gistdump(Relation r)
datum = ((char *) itup);
datum += sizeof(IndexTupleData);
/* get out function for type of key, and out it! */
- itkey = (char *) int_range_out(datum);
+ itkey = (char *) int_range_out((INTRANGE *)datum);
/* itkey = " unable to print"; */
printf("\t[%d] size %d heap <%d,%d> key:%s\n",
offnum, IndexTupleSize(itup), itblkno, itoffno, itkey);
@@ -1247,26 +1244,6 @@ _gistdump(Relation r)
}
}
-#define TRLOWER(tr) (((tr)->bytes))
-#define TRUPPER(tr) (&((tr)->bytes[MAXALIGN(VARSIZE(TRLOWER(tr)))]))
-typedef struct txtrange {
- /* flag: NINF means that lower is negative infinity; PINF means that
- ** upper is positive infinity. 0 means that both are numbers.
- */
- int32 vl_len;
- int32 flag;
- char bytes[2];
-} TXTRANGE;
-
-typedef struct intrange {
- int lower;
- int upper;
- /* flag: NINF means that lower is negative infinity; PINF means that
- ** upper is positive infinity. 0 means that both are numbers.
- */
- int flag;
-} INTRANGE;
-
char *text_range_out(TXTRANGE *r)
{
char *result;
diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c
index 0f3ce3b59d9..a3f19d4ef62 100644
--- a/src/backend/access/gist/gistscan.c
+++ b/src/backend/access/gist/gistscan.c
@@ -13,6 +13,7 @@
#include <postgres.h>
#include <access/gist.h>
+#include <access/gistscan.h>
#include <access/genam.h>
#include <access/rtree.h>
#include <storage/bufmgr.h>
diff --git a/src/backend/access/hash/hashfunc.c b/src/backend/access/hash/hashfunc.c
index b042ca31961..5862800b21d 100644
--- a/src/backend/access/hash/hashfunc.c
+++ b/src/backend/access/hash/hashfunc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/hash/hashfunc.c,v 1.2 1996/10/20 06:34:14 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashfunc.c,v 1.3 1996/11/10 02:57:40 momjian Exp $
*
* NOTES
* These functions are stored in pg_amproc. For each operator class
@@ -18,6 +18,8 @@
#include "postgres.h"
+#include "access/hash.h"
+
uint32 hashint2(int16 key)
{
return ((uint32) ~key);
diff --git a/src/backend/access/heap/stats.c b/src/backend/access/heap/stats.c
index 3035e9fba29..00dac5fabec 100644
--- a/src/backend/access/heap/stats.c
+++ b/src/backend/access/heap/stats.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.8 1996/11/05 11:17:47 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.9 1996/11/10 02:58:11 momjian Exp $
*
* NOTES
* initam should be moved someplace else.
@@ -324,7 +324,7 @@ PrintAndFreeHeapAccessStatistics(HeapAccessStatistics stats)
* ----------------
*/
void
-initam()
+initam(void)
{
/* ----------------
* initialize heap statistics.
diff --git a/src/backend/access/nbtree/nbtcompare.c b/src/backend/access/nbtree/nbtcompare.c
index 5b85054a1e8..5429850d733 100644
--- a/src/backend/access/nbtree/nbtcompare.c
+++ b/src/backend/access/nbtree/nbtcompare.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.5 1996/11/05 10:35:28 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.6 1996/11/10 02:58:37 momjian Exp $
*
* NOTES
* These functions are stored in pg_amproc. For each operator class
@@ -24,6 +24,7 @@
#include <postgres.h>
+#include <utils/builtins.h>
#include <utils/nabstime.h>
int32
diff --git a/src/backend/access/rtree/rtproc.c b/src/backend/access/rtree/rtproc.c
index fdcb95ca1e9..401ceca1c93 100644
--- a/src/backend/access/rtree/rtproc.c
+++ b/src/backend/access/rtree/rtproc.c
@@ -7,13 +7,14 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.4 1996/11/05 10:54:17 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.5 1996/11/10 02:58:53 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <postgres.h>
+#include <utils/builtins.h>
#include <utils/geo-decls.h>
#ifndef HAVE_MEMMOVE
# include <regex/utils.h>
diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c
index b11af7486e7..b85ee1ce131 100644
--- a/src/backend/access/transam/transam.c
+++ b/src/backend/access/transam/transam.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.5 1996/11/05 11:12:28 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.6 1996/11/10 02:59:11 momjian Exp $
*
* NOTES
* This file contains the high level access-method interface to the
@@ -96,7 +96,7 @@ extern bool BuildingBtree;
* ----------------
*/
int
-RecoveryCheckingEnabled()
+RecoveryCheckingEnabled(void)
{
return RecoveryCheckingEnableState;
}
@@ -453,7 +453,7 @@ TransRecover(Relation logRelation)
* Initializes transaction logging.
*/
void
-InitializeTransactionLog()
+InitializeTransactionLog(void)
{
Relation logRelation;
Relation timeRelation;
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 008499fc3b2..ff8908de095 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.4 1996/11/05 11:12:32 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.5 1996/11/10 02:59:16 momjian Exp $
*
* NOTES
* Transaction aborts can now occur two ways:
@@ -218,7 +218,7 @@ bool AMI_OVERRIDE = false;
static int TransactionFlushState = 1;
int
-TransactionFlushEnabled()
+TransactionFlushEnabled(void)
{
return TransactionFlushState;
}
@@ -237,7 +237,7 @@ SetTransactionFlushEnabled(bool state)
* --------------------------------
*/
bool
-IsTransactionState()
+IsTransactionState(void)
{
TransactionState s = CurrentTransactionState;
@@ -1113,7 +1113,7 @@ AbortCurrentTransaction()
* --------------------------------
*/
void
-BeginTransactionBlock()
+BeginTransactionBlock(void)
{
TransactionState s = CurrentTransactionState;
@@ -1151,7 +1151,7 @@ BeginTransactionBlock()
* --------------------------------
*/
void
-EndTransactionBlock()
+EndTransactionBlock(void)
{
TransactionState s = CurrentTransactionState;
@@ -1205,7 +1205,7 @@ EndTransactionBlock()
* --------------------------------
*/
void
-AbortTransactionBlock()
+AbortTransactionBlock(void)
{
TransactionState s = CurrentTransactionState;
diff --git a/src/backend/access/transam/xid.c b/src/backend/access/transam/xid.c
index 5d1293d66bf..4c508b3899d 100644
--- a/src/backend/access/transam/xid.c
+++ b/src/backend/access/transam/xid.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.4 1996/11/05 11:12:33 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/xid.c,v 1.5 1996/11/10 02:59:19 momjian Exp $
*
* OLD COMMENTS
* XXX WARNING
@@ -23,6 +23,7 @@
#include <stdio.h>
#include <postgres.h>
+#include <access/xact.h>
extern TransactionId NullTransactionId;
extern TransactionId DisabledTransactionId;
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
index dfbda65ef4c..b13a1d01f58 100644
--- a/src/backend/catalog/catalog.c
+++ b/src/backend/catalog/catalog.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.4 1996/11/06 06:47:01 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.5 1996/11/10 02:59:21 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -37,6 +37,7 @@ relpath(char relname[])
return(relname);
}
+#ifdef NOT_USED
/*
* issystem - returns non-zero iff relname is a system catalog
*
@@ -56,6 +57,7 @@ issystem(char relname[])
else
return FALSE;
}
+#endif
/*
* IsSystemRelationName --
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index 27704dc7f43..55afd489450 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.7 1996/11/08 00:59:10 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.8 1996/11/10 02:59:25 momjian Exp $
*
* INTERFACE ROUTINES
* heap_creatr() - Create an uncataloged heap relation
@@ -26,27 +26,27 @@
*/
#include <postgres.h>
-#include <catalog/pg_ipl.h>
-#include <catalog/pg_inherits.h>
-#include <catalog/pg_proc.h>
#include <miscadmin.h>
-#include <catalog/indexing.h>
-#include <catalog/catalog.h>
-#include <utils/builtins.h>
+#include <fmgr.h>
#include <access/heapam.h>
-#include <utils/mcxt.h>
-#include <parser/catalog_utils.h>
+#include <catalog/catalog.h>
+#include <catalog/catname.h>
+#include <catalog/heap.h>
#include <catalog/index.h>
-#include <fmgr.h>
+#include <catalog/indexing.h>
+#include <catalog/pg_ipl.h>
+#include <catalog/pg_inherits.h>
+#include <catalog/pg_proc.h>
#include <catalog/pg_index.h>
#include <catalog/pg_type.h>
-#include <catalog/catname.h>
-#include <utils/relcache.h>
#include <storage/bufmgr.h>
-#include <catalog/heap.h>
-#include <rewrite/rewriteRemove.h>
#include <storage/lmgr.h>
#include <storage/smgr.h>
+#include <parser/catalog_utils.h>
+#include <rewrite/rewriteRemove.h>
+#include <utils/builtins.h>
+#include <utils/mcxt.h>
+#include <utils/relcache.h>
#ifndef HAVE_MEMMOVE
# include <regex/utils.h>
#else
@@ -1342,7 +1342,7 @@ heap_destroyr(Relation rdesc)
*/
void
-InitTempRelList()
+InitTempRelList(void)
{
if (tempRels) {
free(tempRels->rels);
@@ -1402,7 +1402,7 @@ AddToTempRelList(Relation r)
go through the tempRels list and destroy each of the relations
*/
void
-DestroyTempRels()
+DestroyTempRels(void)
{
int i;
Relation rdesc;
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index 535386b3629..258376ee8ba 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.15 1996/11/08 00:45:22 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.16 1996/11/10 02:59:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -33,6 +33,7 @@
#include <catalog/pg_type.h>
#include <catalog/catname.h>
#include <catalog/pg_user.h>
+#include <commands/copy.h>
#define ISOCTAL(c) (((c) >= '0') && ((c) <= '7'))
#define VALUE(c) ((c) - '0')
diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c
index eae7873d0d1..d3f1e3841a2 100644
--- a/src/backend/commands/define.c
+++ b/src/backend/commands/define.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.9 1996/11/08 20:45:16 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.10 1996/11/10 02:59:38 momjian Exp $
*
* DESCRIPTION
* The "DefineFoo" routines take the parse tree and pick out the
@@ -59,7 +59,7 @@ static int defGetTypeLength(DefElem *def);
#define DEFAULT_TYPDELIM ','
-void
+static void
case_translate_language_name(const char *input, char *output) {
/*-------------------------------------------------------------------------
Translate the input language name to lower case, except if it's C,
@@ -77,7 +77,7 @@ case_translate_language_name(const char *input, char *output) {
-void
+static void
compute_return_type(const Node *returnType,
char **prorettype_p, bool *returnsSet_p) {
/*---------------------------------------------------------------------------
@@ -98,7 +98,7 @@ compute_return_type(const Node *returnType,
-void
+static void
compute_full_attributes(const List *parameters, int32 *byte_pct_p,
int32 *perbyte_cpu_p, int32 *percall_cpu_p,
int32 *outin_ratio_p, bool *canCache_p) {
@@ -157,7 +157,7 @@ compute_full_attributes(const List *parameters, int32 *byte_pct_p,
-void
+static void
interpret_AS_clause(const char languageName[], const char as[],
char **prosrc_str_p, char **probin_str_p) {
diff --git a/src/backend/commands/rename.c b/src/backend/commands/rename.c
index c383ac3707f..87f995a2d7d 100644
--- a/src/backend/commands/rename.c
+++ b/src/backend/commands/rename.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.3 1996/11/06 08:21:39 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.4 1996/11/10 02:59:42 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -21,6 +21,7 @@
#include <catalog/indexing.h>
#include <catalog/catalog.h>
#include <commands/copy.h>
+#include <commands/rename.h>
#include <executor/execdefs.h> /* for EXEC_{FOR,BACK,FDEBUG,BDEBUG} */
#include <miscadmin.h>
#include <utils/portal.h>
diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index 0d0b7de1d0b..e27d5e15970 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/view.c,v 1.4 1996/11/06 08:21:43 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/view.c,v 1.5 1996/11/10 02:59:45 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -27,6 +27,7 @@
#include <rewrite/rewriteManip.h>
#include <rewrite/rewriteRemove.h>
#include <commands/creatinh.h>
+#include <commands/view.h>
/*---------------------------------------------------------------------
* DefineVirtualRelation
diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c
index 276bb632ae9..bd1e7968c91 100644
--- a/src/backend/executor/execUtils.c
+++ b/src/backend/executor/execUtils.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.4 1996/11/06 06:47:35 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.5 1996/11/10 02:59:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -81,7 +81,7 @@ extern int NIndexTupleProcessed; /* have to be defined in the access
* ----------------------------------------------------------------
*/
void
-ResetTupleCount()
+ResetTupleCount(void)
{
NTupleProcessed = 0;
NTupleRetrieved = 0;
diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c
index 5124d62ef60..29e349bda9e 100644
--- a/src/backend/executor/nodeMergejoin.c
+++ b/src/backend/executor/nodeMergejoin.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.4 1996/11/08 00:45:59 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.5 1996/11/10 02:59:54 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -201,7 +201,7 @@ MJFormOSortopI(List *qualList, Oid sortOp)
* by "sortOp" and reversing the positions of the keys.
* ----------------------------------------------------------------
*/
-List *
+static List *
MJFormISortopO(List *qualList, Oid sortOp)
{
List *ISortopO;
diff --git a/src/backend/executor/nodeTee.c b/src/backend/executor/nodeTee.c
index 2ade8729f90..1ed017f5da7 100644
--- a/src/backend/executor/nodeTee.c
+++ b/src/backend/executor/nodeTee.c
@@ -15,7 +15,7 @@
* ExecEndTee
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.4 1996/11/08 00:46:01 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.5 1996/11/10 03:00:08 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -210,7 +210,7 @@ ExecCountSlotsTee(Tee *node)
because the left and right scans may be at different points
* ----------------------------------------------------------------
*/
-void
+static void
initTeeScanDescs(Tee* node)
{
TeeState *teeState;
diff --git a/src/backend/lib/dllist.c b/src/backend/lib/dllist.c
index 2e4ffea7dd7..a0487edb876 100644
--- a/src/backend/lib/dllist.c
+++ b/src/backend/lib/dllist.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/lib/dllist.c,v 1.3 1996/11/06 08:27:11 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/lib/dllist.c,v 1.4 1996/11/10 03:00:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -19,7 +19,7 @@
#include <lib/dllist.h>
Dllist*
-DLNewList()
+DLNewList(void)
{
Dllist* l;
diff --git a/src/backend/libpq/be-dumpdata.c b/src/backend/libpq/be-dumpdata.c
index e595528b566..d5fb4a941d7 100644
--- a/src/backend/libpq/be-dumpdata.c
+++ b/src/backend/libpq/be-dumpdata.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-dumpdata.c,v 1.3 1996/11/06 08:48:24 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-dumpdata.c,v 1.4 1996/11/10 03:00:23 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -61,7 +61,7 @@ static Dllist *be_portalstack;
* ----------------
*/
void
-be_portalinit()
+be_portalinit(void)
{
be_portalstack = DLNewList();
}
@@ -85,7 +85,7 @@ be_portalpush(PortalEntry *entry)
* ----------------
*/
PortalEntry *
-be_portalpop()
+be_portalpop(void)
{
PortalEntry *p;
Dlelem* elt;
@@ -105,7 +105,7 @@ be_portalpop()
* ----------------
*/
PortalEntry *
-be_currentportal()
+be_currentportal(void)
{
Dlelem* elt;
elt = DLGetTail(be_portalstack);
@@ -128,7 +128,7 @@ static Oid be_portaloid;
static u_int be_portalcnt = 0;
PortalEntry *
-be_newportal()
+be_newportal(void)
{
PortalEntry *entry;
char buf[PortalNameLength];
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 7172dd31a07..409fe12fa8b 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.10 1996/11/06 08:48:27 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.11 1996/11/10 03:00:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -59,7 +59,7 @@ enum Userauth {Trust, Ident};
/* Some standard C libraries, including GNU, have an isblank() function.
Others, including Solaris, do not. So we have our own.
*/
-bool
+static bool
isblank(const char c) {
return(c == ' ' || c == 9 /* tab */);
}
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index 57226d5302f..06be41dea58 100644
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.3 1996/11/08 05:56:39 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.4 1996/11/10 03:00:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -87,7 +87,8 @@ _equalExpr(Expr *a, Expr *b)
return (true);
}
-bool _equalIter(Iter *a, Iter *b)
+static bool
+_equalIter(Iter *a, Iter *b)
{
return (equal(a->iterexpr, b->iterexpr));
}
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index aa9f3fdbab3..e99aeb6a49b 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.2 1996/11/08 05:56:43 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.3 1996/11/10 03:00:44 momjian Exp $
*
* NOTES
* Every (plan) node in POSTGRES has an associated "out" routine which
@@ -52,7 +52,7 @@ static void _outNode(StringInfo str, void *obj);
* _outIntList -
* converts a List of integers
*/
-void
+static void
_outIntList(StringInfo str, List *list)
{
List *l;
diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c
index 2bd39dd4fda..fd65f8b21a2 100644
--- a/src/backend/nodes/print.c
+++ b/src/backend/nodes/print.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.2 1996/11/06 08:54:17 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.3 1996/11/10 03:00:49 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -24,6 +24,7 @@
#include "nodes/pg_list.h"
#include "nodes/execnodes.h"
#include "nodes/parsenodes.h"
+#include "nodes/print.h"
#include "parser/parsetree.h"
#include "parser/catalog_utils.h"
#include "access/heapam.h"
@@ -377,3 +378,4 @@ print_plan (Plan* p, Query* parsetree)
}
+
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index 692e14a84ab..334f820dd06 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.3 1996/11/08 05:56:49 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.4 1996/11/10 03:00:51 momjian Exp $
*
* NOTES
* Most of the read functions for plan nodes are tested. (In fact, they
@@ -1788,7 +1788,7 @@ _readIter()
* ----------------
*/
Node *
-parsePlanString()
+parsePlanString(void)
{
char *token;
int length;
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index 9b0bca2a056..dd0083edfb0 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.3 1996/11/08 05:56:52 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.4 1996/11/10 03:00:55 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -236,6 +236,7 @@ find_join_paths(Query *root, List *outer_rels, int levels_left)
*
*****************************************************************************/
+#ifdef OPTIMIZER_DEBUG
static void
print_joinclauses(Query *root, List *clauses)
{
@@ -250,7 +251,7 @@ print_joinclauses(Query *root, List *clauses)
}
}
-void
+static void
print_path(Query *root, Path *path, int indent)
{
char *ptype = NULL;
@@ -330,7 +331,6 @@ print_path(Query *root, Path *path, int indent)
}
}
-#ifdef OPTIMIZER_DEBUG
static void
debug_print_rel(Query *root, Rel *rel)
{
diff --git a/src/backend/optimizer/util/joininfo.c b/src/backend/optimizer/util/joininfo.c
index 85416db8b33..a4fd6913752 100644
--- a/src/backend/optimizer/util/joininfo.c
+++ b/src/backend/optimizer/util/joininfo.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.1.1.1 1996/07/09 06:21:38 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.2 1996/11/10 03:01:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,6 +16,7 @@
#include "nodes/relation.h"
#include "optimizer/internal.h"
+#include "optimizer/joininfo.h"
#include "optimizer/var.h"
#include "optimizer/clauses.h"
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index ead5d0a79a0..b9c13dd7b95 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.13 1996/11/08 05:57:25 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.14 1996/11/10 03:01:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -89,7 +89,8 @@ static void parseCheckAggregates(ParseState *pstate, Query *qry);
*/
ParseState*
-makeParseState() {
+makeParseState(void)
+{
ParseState *pstate;
pstate = malloc(sizeof(ParseState));
diff --git a/src/backend/parser/catalog_utils.c b/src/backend/parser/catalog_utils.c
index 00745e32c48..dcc754c12ba 100644
--- a/src/backend/parser/catalog_utils.c
+++ b/src/backend/parser/catalog_utils.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.8 1996/11/08 05:57:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.9 1996/11/10 03:01:23 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -83,10 +83,6 @@ static char *attnum_type[SPECIALS] = {
#define MAXFARGS 8 /* max # args to a c or postquel function */
-static Oid **argtype_inherit();
-static Oid **genxprod();
-
-static int findsupers(Oid relid, Oid **supervec);
/*
* This structure is used to explore the inheritance hierarchy above
* nodes in the type tree in order to disambiguate among polymorphic
@@ -108,6 +104,10 @@ typedef struct _CandidateList {
struct _CandidateList *next;
} *CandidateList;
+static Oid **argtype_inherit(int nargs, Oid *oid_array);
+static Oid **genxprod(InhPaths *arginh, int nargs);
+static int findsupers(Oid relid, Oid **supervec);
+
/* check to see if a type id is valid,
* returns true if it is. By using this call before calling
* get_id_type or get_id_typname, more meaningful error messages
@@ -241,7 +241,7 @@ tbyvalue(Type t)
}
/* given a type, return its typetype ('c' for 'c'atalog types) */
-char
+static char
typetypetype(Type t)
{
TypeTupleForm typ;
diff --git a/src/backend/parser/parser.c b/src/backend/parser/parser.c
index a39793bc691..51d11ef89b9 100644
--- a/src/backend/parser/parser.c
+++ b/src/backend/parser/parser.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.8 1996/11/10 02:23:15 bryanh Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.9 1996/11/10 03:01:30 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -118,7 +118,6 @@ fixupsets(Query *parse)
return;
define_sets(parse);
}
-#endif
#ifdef SETS_FIXED
/* Recursively find all of the Consts in the parsetree. Some of
@@ -175,8 +174,8 @@ define_sets(Node *clause)
define_sets(get_leftop (clause));
define_sets(get_rightop (clause));
}
-#endif
}
+#endif
#define PSIZE(PTR) (*((int32 *)(PTR) - 1))
Node *
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 269e643ee35..b9f5ca1ad4f 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.22 1996/11/10 02:24:12 bryanh Exp $
+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.23 1996/11/10 03:01:41 momjian Exp $
*
* NOTES
*
@@ -982,7 +982,7 @@ BackendStartup(StartupInfo *packet, /* client's startup packet */
* If you don't like that, well, we *used* to pass the whole option string
* as ONE argument to execl(), which was even less intelligent...
*/
-void
+static void
split_opts(char **argv, int *argcp, char *s)
{
int i = *argcp;
diff --git a/src/backend/rewrite/locks.c b/src/backend/rewrite/locks.c
index a45457f61de..3171d2c845b 100644
--- a/src/backend/rewrite/locks.c
+++ b/src/backend/rewrite/locks.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.1.1.1 1996/07/09 06:21:51 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.2 1996/11/10 03:01:50 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -26,7 +26,7 @@
* if we find at least one such match, we return true
* otherwise, we return false
*/
-bool
+static bool
nodeThisLockWasTriggered(Node *node, int varno, AttrNumber attnum)
{
if (node==NULL)
diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c
index 36026a53585..a7b6ebbc796 100644
--- a/src/backend/rewrite/rewriteDefine.c
+++ b/src/backend/rewrite/rewriteDefine.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.1.1.1 1996/07/09 06:21:51 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.2 1996/11/10 03:01:55 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -25,6 +25,7 @@
#include "nodes/parsenodes.h"
#include "parser/catalog_utils.h"
#include "rewrite/locks.h"
+#include "rewrite/rewriteDefine.h"
#include "rewrite/rewriteRemove.h"
#include "rewrite/rewriteSupport.h"
#include "tcop/tcopprot.h"
diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c
index d6ef58614d1..01fad29f773 100644
--- a/src/backend/rewrite/rewriteManip.c
+++ b/src/backend/rewrite/rewriteManip.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.3 1996/11/06 06:48:44 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.4 1996/11/10 03:02:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -21,6 +21,7 @@
#include "utils/lsyscache.h"
#include "utils/builtins.h"
#include "rewrite/rewriteHandler.h"
+#include "rewrite/rewriteManip.h"
#include "rewrite/rewriteSupport.h"
#include "rewrite/locks.h"
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);
diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c
index ed95cfb623a..82e847812e6 100644
--- a/src/backend/tcop/dest.c
+++ b/src/backend/tcop/dest.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.2 1996/11/03 06:52:31 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.3 1996/11/10 03:02:42 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -135,7 +135,7 @@ EndCommand(char *commandTag, CommandDest dest)
*
*/
void
-SendCopyBegin()
+SendCopyBegin(void)
{
pq_putnchar("B", 1);
/* pq_putint(0, 4); */
@@ -143,7 +143,7 @@ SendCopyBegin()
}
void
-ReceiveCopyBegin()
+ReceiveCopyBegin(void)
{
pq_putnchar("D", 1);
/* pq_putint(0, 4); */
@@ -316,7 +316,7 @@ BeginCommand(char *pname,
static Oid AppendOid;
void
-ResetAppendOid()
+ResetAppendOid(void)
{
AppendOid = InvalidOid;
}
@@ -345,7 +345,7 @@ UpdateAppendOid(Oid newoid)
}
Oid
-GetAppendOid()
+GetAppendOid(void)
{
if (AppendOid == MULTI_TUPLE_APPEND)
return InvalidOid;
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index c146dcd9713..2f9ae7bfd51 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.16 1996/11/10 02:25:15 bryanh Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.17 1996/11/10 03:02:50 momjian Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@@ -54,6 +54,7 @@
#include "tcop/tcopprot.h" /* where declarations for this file go */
#include "optimizer/planner.h"
+#include "tcop/tcopprot.h"
#include "tcop/tcopdebug.h"
#include "executor/execdebug.h"
@@ -1256,7 +1257,7 @@ PostgresMain(int argc, char *argv[])
*/
if (IsUnderPostmaster == false) {
puts("\nPOSTGRES backend interactive interface");
- puts("$Revision: 1.16 $ $Date: 1996/11/10 02:25:15 $");
+ puts("$Revision: 1.17 $ $Date: 1996/11/10 03:02:50 $");
}
/* ----------------
@@ -1464,7 +1465,7 @@ struct rusage Save_r;
struct timeval Save_t;
void
-ResetUsage()
+ResetUsage(void)
{
struct timezone tz;
getrusage(RUSAGE_SELF, &Save_r);
@@ -1474,7 +1475,7 @@ ResetUsage()
}
void
-ShowUsage()
+ShowUsage(void)
{
struct timeval user, sys;
struct timeval elapse_t;
diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
index e36ef730fe7..6e7713ced15 100644
--- a/src/backend/tcop/pquery.c
+++ b/src/backend/tcop/pquery.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.4 1996/11/08 05:59:34 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.5 1996/11/10 03:02:54 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -65,7 +65,7 @@ CreateQueryDesc(Query *parsetree,
* ----------------------------------------------------------------
*/
EState *
-CreateExecutorState()
+CreateExecutorState(void)
{
EState *state;
extern int NBuffers;
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index e6494ea1349..0556083ff1b 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.5 1996/11/06 10:30:36 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.6 1996/11/10 03:03:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -325,7 +325,7 @@ aclownerdefault(AclId ownerid)
}
Acl *
-acldefault()
+acldefault(void)
{
Acl *acl;
AclItem *aip;
diff --git a/src/backend/utils/adt/arrayutils.c b/src/backend/utils/adt/arrayutils.c
index 5f175df0319..fce0b0ddd57 100644
--- a/src/backend/utils/adt/arrayutils.c
+++ b/src/backend/utils/adt/arrayutils.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayutils.c,v 1.2 1996/11/06 06:49:41 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayutils.c,v 1.3 1996/11/10 03:03:03 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,6 +16,8 @@
#include "postgres.h"
+#include "utils/array.h"
+
int
GetOffset(int n, int dim[], int lb[], int indx[])
{
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index 20a3aeeddb8..80dbae8dd0a 100644
--- a/src/backend/utils/adt/date.c
+++ b/src/backend/utils/adt/date.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.3 1996/11/06 10:30:44 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.4 1996/11/10 03:03:05 momjian Exp $
*
* NOTES
* This code is actually (almost) unused.
@@ -852,7 +852,7 @@ static int istinterval(char *i_string,
* time with precision up to microsecs.) - ay 3/95
*/
text *
-timeofday()
+timeofday(void)
{
#ifndef WIN32
diff --git a/src/backend/utils/adt/datetimes.c b/src/backend/utils/adt/datetimes.c
index 06f2e373d72..f38b2c1171a 100644
--- a/src/backend/utils/adt/datetimes.c
+++ b/src/backend/utils/adt/datetimes.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/datetimes.c,v 1.5 1996/11/06 06:49:45 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/datetimes.c,v 1.6 1996/11/10 03:03:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,22 +15,8 @@
#include <string.h>
#include <postgres.h>
-#include <utils/palloc.h>
-
-/* these things look like structs, but we pass them by value so be careful
- For example, passing an int -> DateADT is not portable! */
-typedef struct DateADT {
- char day;
- char month;
- short year;
-} DateADT;
-
-typedef struct TimeADT {
- short hr;
- short min;
- float sec;
-} TimeADT;
-
+#include <utils/builtins.h>
+#include <utils/datetime.h>
static int day_tab[2][12] = {
{31,28,31,30,31,30,31,31,30,31,30,31},
diff --git a/src/backend/utils/adt/geo-selfuncs.c b/src/backend/utils/adt/geo-selfuncs.c
index a816e738f53..77454064cd6 100644
--- a/src/backend/utils/adt/geo-selfuncs.c
+++ b/src/backend/utils/adt/geo-selfuncs.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/geo-selfuncs.c,v 1.1.1.1 1996/07/09 06:22:04 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/geo-selfuncs.c,v 1.2 1996/11/10 03:03:13 momjian Exp $
*
* XXX These are totally bogus.
*
@@ -19,6 +19,7 @@
#include "access/attnum.h"
#include "utils/geo-decls.h" /* where function declarations go */
#include "utils/palloc.h"
+#include "utils/builtins.h"
float64
areasel(Oid opid,
diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c
index 127d59a2812..2e279317b95 100644
--- a/src/backend/utils/adt/like.c
+++ b/src/backend/utils/adt/like.c
@@ -22,8 +22,6 @@
#include "utils/palloc.h"
#include "utils/builtins.h" /* where the function declarations go */
-int like(char *text, char *p);
-
/*
* interface routines called by the function manager
*/
@@ -142,7 +140,7 @@ bool textnlike(struct varlena *s, struct varlena *p)
}
-/* $Revision: 1.3 $
+/* $Revision: 1.4 $
** "like.c" A first attempt at a LIKE operator for Postgres95.
**
** Originally written by Rich $alz, mirror!rs, Wed Nov 26 19:03:17 EST 1986.
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index 5c5531882ed..4a86ced5a08 100644
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -1,20 +1,20 @@
/*-------------------------------------------------------------------------
*
- * char.c--
+ * varchar.c--
* Functions for the built-in type char() and varchar().
*
* Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.5 1996/11/06 06:50:06 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.6 1996/11/10 03:03:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <stdio.h> /* for sprintf() */
#include <string.h>
#include "postgres.h"
-#include "utils/palloc.h"
+#include "utils/builtins.h"
/*
* CHAR() and VARCHAR() types are part of the ANSI SQL standard. CHAR()
diff --git a/src/backend/utils/cache/fcache.c b/src/backend/utils/cache/fcache.c
index f4c5ef3e907..1d86364abda 100644
--- a/src/backend/utils/cache/fcache.c
+++ b/src/backend/utils/cache/fcache.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.3 1996/11/06 10:31:22 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.4 1996/11/10 03:03:22 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -26,6 +26,7 @@
#include "parser/parsetree.h" /* for getrelname() */
#include "utils/builtins.h"
#include "utils/fcache.h"
+#include "utils/fcache2.h"
#include "nodes/primnodes.h"
#include "nodes/execnodes.h"
#ifndef HAVE_MEMMOVE
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index b72cc02cf50..6918cada212 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.4 1996/11/06 10:31:27 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.5 1996/11/10 03:03:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1447,7 +1447,7 @@ RelationPurgeLocalRelation(bool xactCommitted)
#define INITRELCACHESIZE 400
void
-RelationInitialize()
+RelationInitialize(void)
{
MemoryContext oldcxt;
HASHCTL ctl;
@@ -1536,7 +1536,7 @@ RelationInitialize()
#define Num_indices_bootstrap 3
void
-init_irels()
+init_irels(void)
{
Size len;
int nread;
@@ -1676,7 +1676,7 @@ init_irels()
}
void
-write_irels()
+write_irels(void)
{
int len;
int nwritten;
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index fca7ee329f0..f35c5d7d8d0 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.9 1996/11/08 05:59:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.10 1996/11/10 03:03:28 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -196,7 +196,7 @@ elog(int lev, const char *fmt, ... )
#ifndef PG_STANDALONE
int
-DebugFileOpen()
+DebugFileOpen(void)
{
int fd, istty;
diff --git a/src/backend/utils/error/exc.c b/src/backend/utils/error/exc.c
index 59ec7b00866..3cc3f01f508 100644
--- a/src/backend/utils/error/exc.c
+++ b/src/backend/utils/error/exc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.5 1996/11/03 06:53:26 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.6 1996/11/10 03:03:31 momjian Exp $
*
* NOTE
* XXX this code needs improvement--check for state violations and
@@ -135,7 +135,7 @@ ExcPrint(Exception *excP,
}
ExcProc *
-ExcGetUnCaught()
+ExcGetUnCaught(void)
{
return (ExcUnCaughtP);
}
diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c
index af835d279ac..f2cab230cf5 100644
--- a/src/backend/utils/hash/dynahash.c
+++ b/src/backend/utils/hash/dynahash.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.5 1996/11/08 20:46:07 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.6 1996/11/10 03:03:36 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -122,9 +122,9 @@ DynaHashFree(Pointer ptr)
* ----------------
*/
-static int expand_table();
-static int hdefault();
-static int init_htab();
+static int expand_table(HTAB *hashp);
+static int hdefault(HTAB *hashp);
+static int init_htab(HTAB *hashp, int nelem);
/*
diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c
index 5e6b4094836..41908232065 100644
--- a/src/backend/utils/mmgr/aset.c
+++ b/src/backend/utils/mmgr/aset.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.3 1996/11/08 06:00:48 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.4 1996/11/10 03:03:45 momjian Exp $
*
* NOTE
* XXX This is a preliminary implementation which lacks fail-fast
@@ -128,6 +128,7 @@ AllocSetReset(AllocSet set)
}
}
+#ifdef NOT_USED
void
AllocSetReset_debug(char *file, int line, AllocSet set)
{
@@ -139,6 +140,7 @@ AllocSetReset_debug(char *file, int line, AllocSet set)
AllocSetFree(set, pointer);
}
}
+#endif
/*
* AllocSetContains --