summaryrefslogtreecommitdiff
path: root/src/pl
diff options
context:
space:
mode:
authorBruce Momjian2002-11-10 07:25:14 +0000
committerBruce Momjian2002-11-10 07:25:14 +0000
commit8fee9615ccdfb7ed99de3dfe0d964952ed45d978 (patch)
treeb13cf68a8e97d5e89a106fd7da9c3b524ad7a8c2 /src/pl
parent78822b328c2907accf590d5473a0508ea3ee07a5 (diff)
Merge palloc()/MemSet(0) calls into a single palloc0() call.
Diffstat (limited to 'src/pl')
-rw-r--r--src/pl/plpgsql/src/pl_exec.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index bbf59f2ae8d..2d90d60903c 100644
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -3,7 +3,7 @@
* procedural language
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.66 2002/11/10 00:35:58 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.67 2002/11/10 07:25:14 momjian Exp $
*
* This software is copyrighted by Jan Wieck - Hamburg.
*
@@ -1008,7 +1008,7 @@ exec_stmt_perform(PLpgSQL_execstate * estate, PLpgSQL_stmt_perform * stmt)
*/
if (expr->plan == NULL)
exec_prepare_plan(estate, expr);
-
+
rc = exec_run_select(estate, expr, 0, NULL);
if (rc != SPI_OK_SELECT)
elog(ERROR, "query \"%s\" didn't return data", expr->query);
@@ -1627,9 +1627,8 @@ exec_stmt_return_next(PLpgSQL_execstate * estate,
if (natts != stmt->row->nfields)
elog(ERROR, "Wrong record type supplied in RETURN NEXT");
- dvalues = (Datum *) palloc(natts * sizeof(Datum));
+ dvalues = (Datum *) palloc0(natts * sizeof(Datum));
nulls = (char *) palloc(natts * sizeof(char));
- MemSet(dvalues, 0, natts * sizeof(Datum));
MemSet(nulls, 'n', natts);
for (i = 0; i < natts; i++)