Fix my old fault(returns auto variable reference).

Hiroshi Inoue · Hiroshi Inoue · commit 852a26f79ed0 · 2001-07-06T09:41:36.000Z
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.121 2001/06/29 21:08:23 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.122 2001/07/06 09:41:36 inoue Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -1024,7 +1024,8 @@ heap_get_latest_tid(Relation relation,
 	{
 		if (linkend)
 			return NULL;
-		return heap_get_latest_tid(relation, snapshot, &ctid);
+		heap_get_latest_tid(relation, snapshot, &ctid);
+		*tid = ctid;
 	}
 
 	return tid;
diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.24 2001/03/22 03:59:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.25 2001/07/06 09:41:36 inoue Exp $
  *
  * NOTES
  *	  input routine largely stolen from boxin().
@@ -129,17 +129,14 @@ currtid_byreloid(PG_FUNCTION_ARGS)
 {
 	Oid			reloid = PG_GETARG_OID(0);
 	ItemPointer tid = PG_GETARG_ITEMPOINTER(1);
-	ItemPointer result,
-				ret;
+	ItemPointer result;
 	Relation	rel;
 
 	result = (ItemPointer) palloc(sizeof(ItemPointerData));
-	ItemPointerSetInvalid(result);
+	ItemPointerCopy(tid, result);
 	if ((rel = heap_open(reloid, AccessShareLock)) != NULL)
 	{
-		ret = heap_get_latest_tid(rel, SnapshotNow, tid);
-		if (ret)
-			ItemPointerCopy(ret, result);
+		heap_get_latest_tid(rel, SnapshotNow, result);
 		heap_close(rel, AccessShareLock);
 	}
 	else
@@ -153,21 +150,18 @@ currtid_byrelname(PG_FUNCTION_ARGS)
 {
 	text	   *relname = PG_GETARG_TEXT_P(0);
 	ItemPointer tid = PG_GETARG_ITEMPOINTER(1);
-	ItemPointer result,
-				ret;
+	ItemPointer result;
 	char	   *str;
 	Relation	rel;
 
 	str = DatumGetCString(DirectFunctionCall1(textout,
 											  PointerGetDatum(relname)));
 
 	result = (ItemPointer) palloc(sizeof(ItemPointerData));
-	ItemPointerSetInvalid(result);
+	ItemPointerCopy(tid, result);
 	if ((rel = heap_openr(str, AccessShareLock)) != NULL)
 	{
-		ret = heap_get_latest_tid(rel, SnapshotNow, tid);
-		if (ret)
-			ItemPointerCopy(ret, result);
+		heap_get_latest_tid(rel, SnapshotNow, result);
 		heap_close(rel, AccessShareLock);
 	}
 	else

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.121 2001/06/29 21:08:23 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.122 2001/07/06 09:41:36 inoue Exp $`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`* INTERFACE ROUTINES`
`@@ -1024,7 +1024,8 @@ heap_get_latest_tid(Relation relation,`
`1024`	`1024`	`{`
`1025`	`1025`	`if (linkend)`
`1026`	`1026`	`return NULL;`
`1027`		`- return heap_get_latest_tid(relation, snapshot, &ctid);`
	`1027`	`+ heap_get_latest_tid(relation, snapshot, &ctid);`
	`1028`	`+ *tid = ctid;`
`1028`	`1029`	`}`
`1029`	`1030`
`1030`	`1031`	`return tid;`