aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>1998-08-20 22:24:11 +0000
committerBruce Momjian <bruce@momjian.us>1998-08-20 22:24:11 +0000
commit8ae24a756603cd5a526fe59ecf020d32941020b5 (patch)
treebbd754cd0aa39a84e1f91591bc4ffd72bac9aa11
parent4a700021494a78c5a943b32d4ba30d22d8d0f3d9 (diff)
downloadpostgresql-8ae24a756603cd5a526fe59ecf020d32941020b5.tar.gz
postgresql-8ae24a756603cd5a526fe59ecf020d32941020b5.zip
update fixes.
-rw-r--r--src/backend/commands/cluster.c5
-rw-r--r--src/backend/storage/large_object/inv_api.c8
2 files changed, 5 insertions, 8 deletions
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index 6f291cf7a38..b0cc82e7cf5 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -14,7 +14,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.28 1998/08/19 02:01:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.29 1998/08/20 22:24:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -349,8 +349,7 @@ rebuildheap(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex)
ScanDesc = index_beginscan(LocalOldIndex, false, 0, (ScanKey) NULL);
- while ((ScanResult =
- index_getnext(ScanDesc, ForwardScanDirection)) != NULL)
+ while ((ScanResult = index_getnext(ScanDesc, ForwardScanDirection)) != NULL)
{
HeapTid = &ScanResult->heap_iptr;
diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index 28856f51845..113c07cc79f 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.34 1998/08/19 02:02:38 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.35 1998/08/20 22:24:11 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -644,11 +644,8 @@ inv_fetchtup(LargeObjectDesc *obj_desc, Buffer *buffer)
&skey);
}
- res = NULL;
do
{
- if (res)
- pfree(res);
res = index_getnext(obj_desc->iscan, ForwardScanDirection);
if (res == (RetrieveIndexResult) NULL)
@@ -668,7 +665,8 @@ inv_fetchtup(LargeObjectDesc *obj_desc, Buffer *buffer)
*/
tuple = heap_fetch(obj_desc->heap_r, SnapshotNow,
- &(res->heap_iptr), buffer);
+ &res->heap_iptr, buffer);
+ pfree(res);
} while (tuple == (HeapTuple) NULL);
/* remember this tid -- we may need it for later reads/writes */