56
56
* Portions Copyright (c) 1994, Regents of the University of California
57
57
*
58
58
* IDENTIFICATION
59
- * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtsort.c,v 1.88 2004/08/29 05:06:40 momjian Exp $
59
+ * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtsort.c,v 1.89 2004/09/27 04:01:22 neilc Exp $
60
60
*
61
61
*-------------------------------------------------------------------------
62
62
*/
185
185
_bt_spooldestroy (BTSpool * btspool )
186
186
{
187
187
tuplesort_end (btspool -> sortstate );
188
- pfree (( void * ) btspool );
188
+ pfree (btspool );
189
189
}
190
190
191
191
/*
@@ -551,7 +551,7 @@ _bt_buildadd(BTWriteState *wstate, BTPageState *state, BTItem bti)
551
551
ItemPointerSet (& (state -> btps_minkey -> bti_itup .t_tid ),
552
552
oblkno , P_HIKEY );
553
553
_bt_buildadd (wstate , state -> btps_next , state -> btps_minkey );
554
- pfree (( void * ) state -> btps_minkey );
554
+ pfree (state -> btps_minkey );
555
555
556
556
/*
557
557
* Save a copy of the minimum key for the new page. We have to
@@ -649,7 +649,7 @@ _bt_uppershutdown(BTWriteState *wstate, BTPageState *state)
649
649
ItemPointerSet (& (s -> btps_minkey -> bti_itup .t_tid ),
650
650
blkno , P_HIKEY );
651
651
_bt_buildadd (wstate , s -> btps_next , s -> btps_minkey );
652
- pfree (( void * ) s -> btps_minkey );
652
+ pfree (s -> btps_minkey );
653
653
s -> btps_minkey = NULL ;
654
654
}
655
655
@@ -767,15 +767,15 @@ _bt_load(BTWriteState *wstate, BTSpool *btspool, BTSpool *btspool2)
767
767
{
768
768
_bt_buildadd (wstate , state , bti );
769
769
if (should_free )
770
- pfree (( void * ) bti );
770
+ pfree (bti );
771
771
bti = (BTItem ) tuplesort_getindextuple (btspool -> sortstate ,
772
772
true, & should_free );
773
773
}
774
774
else
775
775
{
776
776
_bt_buildadd (wstate , state , bti2 );
777
777
if (should_free2 )
778
- pfree (( void * ) bti2 );
778
+ pfree (bti2 );
779
779
bti2 = (BTItem ) tuplesort_getindextuple (btspool2 -> sortstate ,
780
780
true, & should_free2 );
781
781
}
@@ -794,7 +794,7 @@ _bt_load(BTWriteState *wstate, BTSpool *btspool, BTSpool *btspool2)
794
794
795
795
_bt_buildadd (wstate , state , bti );
796
796
if (should_free )
797
- pfree (( void * ) bti );
797
+ pfree (bti );
798
798
}
799
799
}
800
800
0 commit comments