postgrespro
diff --git a/‎src/backend/access/common/indextuple.c
Lines changed: 8 additions & 9 deletions b/‎src/backend/access/common/indextuple.c
Lines changed: 8 additions & 9 deletions
diff --git a/‎src/backend/access/nbtree/nbtinsert.c
Lines changed: 2 additions & 5 deletions b/‎src/backend/access/nbtree/nbtinsert.c
Lines changed: 2 additions & 5 deletions
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.63 2002/11/13 00:39:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.64 2003/02/23 06:17:12 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -394,17 +394,16 @@ nocache_index_getattr(IndexTuple tup,
 }
 
 /*
- * Copies source into target.  If *target == NULL, we palloc space; otherwise
- * we assume we have space that is already palloc'ed.
+ * Create a palloc'd copy of an index tuple.
  */
-void
-CopyIndexTuple(IndexTuple source, IndexTuple *target)
+IndexTuple
+CopyIndexTuple(IndexTuple source)
 {
+	IndexTuple	result;
 	Size		size;
 
 	size = IndexTupleSize(source);
-	if (*target == NULL)
-		*target = (IndexTuple) palloc(size);
-
-	memmove((char *) *target, (char *) source, size);
+	result = (IndexTuple) palloc(size);
+	memcpy(result, source, size);
+	return result;
 }
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.98 2003/02/22 00:45:03 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.99 2003/02/23 06:17:13 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -58,7 +58,6 @@ static OffsetNumber _bt_findsplitloc(Relation rel, Page page,
 static void _bt_checksplitloc(FindSplitData *state, OffsetNumber firstright,
 				  int leftfree, int rightfree,
 				  bool newitemonleft, Size firstrightitemsz);
-static Buffer _bt_getstackbuf(Relation rel, BTStack stack, int access);
 static void _bt_pgaddtup(Relation rel, Page page,
 			 Size itemsize, BTItem btitem,
 			 OffsetNumber itup_off, const char *where);
@@ -666,7 +665,6 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright,
 				rightoff;
 	OffsetNumber maxoff;
 	OffsetNumber i;
-	BTItem		lhikey;
 
 	rbuf = _bt_getbuf(rel, P_NEW, BT_WRITE);
 	origpage = BufferGetPage(buf);
@@ -730,7 +728,6 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright,
 		itemsz = ItemIdGetLength(itemid);
 		item = (BTItem) PageGetItem(origpage, itemid);
 	}
-	lhikey = item;
 	if (PageAddItem(leftpage, (Item) item, itemsz, leftoff,
 					LP_USED) == InvalidOffsetNumber)
 		elog(PANIC, "btree: failed to add hikey to the left sibling");
@@ -1262,7 +1259,7 @@ _bt_insert_parent(Relation rel,
  *
  *		Returns InvalidBuffer if item not found (should not happen).
  */
-static Buffer
+Buffer
 _bt_getstackbuf(Relation rel, BTStack stack, int access)
 {
 	BlockNumber blkno;
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.63 2002/11/13 00:39:46 momjian Exp $`
	`12`	`+ * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.64 2003/02/23 06:17:12 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -394,17 +394,16 @@ nocache_index_getattr(IndexTuple tup,`
`394`	`394`	`}`
`395`	`395`
`396`	`396`	`/*`
`397`		`- * Copies source into target. If *target == NULL, we palloc space; otherwise`
`398`		`- * we assume we have space that is already palloc'ed.`
	`397`	`+ * Create a palloc'd copy of an index tuple.`
`399`	`398`	`*/`
`400`		`-void`
`401`		`-CopyIndexTuple(IndexTuple source, IndexTuple *target)`
	`399`	`+IndexTuple`
	`400`	`+CopyIndexTuple(IndexTuple source)`
`402`	`401`	`{`
	`402`	`+ IndexTuple result;`
`403`	`403`	`Size size;`
`404`	`404`
`405`	`405`	`size = IndexTupleSize(source);`
`406`		`- if (*target == NULL)`
`407`		`- *target = (IndexTuple) palloc(size);`
`408`		`-`
`409`		`- memmove((char ) target, (char *) source, size);`
	`406`	`+ result = (IndexTuple) palloc(size);`
	`407`	`+ memcpy(result, source, size);`
	`408`	`+ return result;`
`410`	`409`	`}`