aboutsummaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>1999-03-19 18:56:43 +0000
committerBruce Momjian <bruce@momjian.us>1999-03-19 18:56:43 +0000
commitbd6f98af312d464b0052c244832c5f183cfd9575 (patch)
tree5cf484f58a457ce809efc1745a540e24ebda1f03 /src/backend
parent0d01fd4e19aec4200ce257f0cc9e1bbce7373dae (diff)
downloadpostgresql-bd6f98af312d464b0052c244832c5f183cfd9575.tar.gz
postgresql-bd6f98af312d464b0052c244832c5f183cfd9575.zip
I suggest the following portability patch, which does not
change functionality, but makes the code more ANSI C'ish. My AIX xlc compiler barfs on all of these. Can someone please review and apply to current. <<port.patch>> Thanks Andreas
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/executor/execMain.c5
-rw-r--r--src/backend/optimizer/plan/planner.c10
2 files changed, 8 insertions, 7 deletions
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 5180486b8b6..962c235818d 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -26,7 +26,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.79 1999/02/22 19:40:09 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.80 1999/03/19 18:56:36 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1724,7 +1724,8 @@ EvalPlanQual(EState *estate, Index rti, ItemPointer tid)
}
/* push current PQ to the stack */
epqstate->es_evalPlanQual = (Pointer) epq;
- estate->es_evalPlanQual = (Pointer) epq = newepq;
+ epq = newepq;
+ estate->es_evalPlanQual = (Pointer) epq;
epq->rti = rti;
endNode = false;
}
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 1847c2d986e..27d5892ee0c 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.45 1999/02/21 03:48:49 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.46 1999/03/19 18:56:37 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -283,20 +283,20 @@ union_planner(Query *parse)
/* convert the havingQual to conjunctive normal form (cnf) */
- (List *) parse->havingQual=cnfify((Expr *)(Node *) parse->havingQual,true);
+ parse->havingQual = (Node *) cnfify((Expr *)(Node *) parse->havingQual,true);
/* There is a subselect in the havingQual, so we have to process it
* using the same function as for a subselect in 'where' */
if (parse->hasSubLinks)
{
- (List *) parse->havingQual =
- (List *) SS_process_sublinks((Node *) parse->havingQual);
+ parse->havingQual =
+ (Node *) SS_process_sublinks((Node *) parse->havingQual);
}
/* Calculate the opfids from the opnos (=select the correct functions for
* the used VAR datatypes) */
- (List *) parse->havingQual=fix_opids((List *) parse->havingQual);
+ parse->havingQual = (Node *) fix_opids((List *) parse->havingQual);
((Agg *) result_plan)->plan.qual=(List *) parse->havingQual;