From 983ec2cb4bf942a61c6130bce502007569d1403f Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 26 Nov 1997 03:54:23 +0000
Subject: [PATCH] Make parser functions static where possible.
---
src/backend/executor/execQual.c | 22 +++++++---------------
src/backend/utils/time/tqual.c | 7 +++----
src/include/executor/executor.h | 6 +++---
3 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index 171277da036..b4340fe60d7 100644
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.19 1997/09/27 14:37:10 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.20 1997/11/26 03:54:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -70,24 +70,19 @@ int execConstLen;
/* static functions decls */
static Datum ExecEvalAggreg(Aggreg *agg, ExprContext *econtext, bool *isNull);
-static Datum
-ExecEvalArrayRef(ArrayRef *arrayRef, ExprContext *econtext,
+static Datum ExecEvalArrayRef(ArrayRef *arrayRef, ExprContext *econtext,
bool *isNull, bool *isDone);
static Datum ExecEvalAnd(Expr *andExpr, ExprContext *econtext, bool *isNull);
-static Datum
-ExecEvalFunc(Expr *funcClause, ExprContext *econtext,
+static Datum ExecEvalFunc(Expr *funcClause, ExprContext *econtext,
bool *isNull, bool *isDone);
-static void
-ExecEvalFuncArgs(FunctionCachePtr fcache, ExprContext *econtext,
+static void ExecEvalFuncArgs(FunctionCachePtr fcache, ExprContext *econtext,
List *argList, Datum argV[], bool *argIsDone);
static Datum ExecEvalNot(Expr *notclause, ExprContext *econtext, bool *isNull);
-static Datum
-ExecEvalOper(Expr *opClause, ExprContext *econtext,
+static Datum ExecEvalOper(Expr *opClause, ExprContext *econtext,
bool *isNull);
static Datum ExecEvalOr(Expr *orExpr, ExprContext *econtext, bool *isNull);
static Datum ExecEvalVar(Var *variable, ExprContext *econtext, bool *isNull);
-static Datum
-ExecMakeFunctionResult(Node *node, List *arguments,
+static Datum ExecMakeFunctionResult(Node *node, List *arguments,
ExprContext *econtext, bool *isNull, bool *isDone);
static bool ExecQualClause(Node *clause, ExprContext *econtext);
@@ -506,10 +501,7 @@ ExecEvalParam(Param *expression, ExprContext *econtext, bool *isNull)
* to use this. Ex: overpaid(EMP) might call GetAttributeByNum().
* ----------------
*/
-/*
- * This gets called from external functions, so don't make it static
- * or remove it
- */
+/* static but gets called from external functions */
char *
GetAttributeByNum(TupleTableSlot *slot,
AttrNumber attrno,
diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c
index a8a00c3fbfa..dea288da584 100644
--- a/src/backend/utils/time/tqual.c
+++ b/src/backend/utils/time/tqual.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.12 1997/11/26 03:42:58 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.13 1997/11/26 03:54:18 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -24,8 +24,6 @@
#include "utils/palloc.h"
#include "utils/tqual.h"
-static bool heapisoverride(void);
-
extern bool PostgresIsInitialized;
/*
@@ -51,7 +49,8 @@ setheapoverride(bool on)
}
}
-static bool
+/* static, but called in debug macro */
+bool
heapisoverride()
{
if (!TransactionIdIsValid(HeapSpecialTransactionId))
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index 0e20bda73ef..c0d02006860 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: executor.h,v 1.15 1997/11/20 23:23:39 momjian Exp $
+ * $Id: executor.h,v 1.16 1997/11/26 03:54:23 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -79,8 +79,8 @@ ExecEvalParam(Param *expression, ExprContext *econtext,
bool *isNull);
/* stop here */
-extern char *
-GetAttributeByNum(TupleTableSlot *slot, AttrNumber attrno, bool *isNull);
+extern char *GetAttributeByNum(TupleTableSlot *slot, AttrNumber attrno,
+ bool *isNull);
extern char *
GetAttributeByName(TupleTableSlot *slot, char *attname, bool *isNull);
extern Datum
--
GitLab