Commit b847d297 authored by Bruce Momjian's avatar Bruce Momjian

Remove PERFECT_MEM

Unallocate opaque.
parent f8e02c19
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.10 1996/11/13 20:47:18 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.11 1996/11/15 18:36:59 momjian Exp $
* *
* NOTES * NOTES
* This file contains only the public interface routines. * This file contains only the public interface routines.
...@@ -277,7 +277,6 @@ btbuild(Relation heap, ...@@ -277,7 +277,6 @@ btbuild(Relation heap,
} }
} }
/* be tidy */
pfree(nulls); pfree(nulls);
pfree(attdata); pfree(attdata);
...@@ -468,13 +467,10 @@ btendscan(IndexScanDesc scan) ...@@ -468,13 +467,10 @@ btendscan(IndexScanDesc scan)
ItemPointerSetInvalid(iptr); ItemPointerSetInvalid(iptr);
} }
/* don't need scan registered anymore */ pfree (scan->opaque);
_bt_dropscan(scan);
/* be tidy */
if ( so->keyData != (ScanKey) NULL ) if ( so->keyData != (ScanKey) NULL )
pfree (so->keyData); pfree (so->keyData);
pfree (scan->opaque); _bt_dropscan(scan);
} }
/* /*
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.5 1996/11/05 10:35:33 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.6 1996/11/15 18:37:00 momjian Exp $
* *
* *
* NOTES * NOTES
...@@ -78,9 +78,7 @@ _bt_dropscan(IndexScanDesc scan) ...@@ -78,9 +78,7 @@ _bt_dropscan(IndexScanDesc scan)
else else
last->btsl_next = chk->btsl_next; last->btsl_next = chk->btsl_next;
#ifdef PERFECT_MEM
pfree (chk); pfree (chk);
#endif /* PERFECT_MEM */
} }
void void
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.8 1996/11/05 10:54:19 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.9 1996/11/15 18:37:10 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -223,6 +223,7 @@ rtendscan(IndexScanDesc s) ...@@ -223,6 +223,7 @@ rtendscan(IndexScanDesc s)
if (p != (RTreeScanOpaque) NULL) { if (p != (RTreeScanOpaque) NULL) {
freestack(p->s_stack); freestack(p->s_stack);
freestack(p->s_markstk); freestack(p->s_markstk);
pfree (s->opaque);
} }
rtdropscan(s); rtdropscan(s);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment