Skip to content

Commit 1d84996

Browse files
committed
Set a better JLongGet(... example in DualState.c
While void * works, mistakes are more easily caught with the intended pointer type.
1 parent 97137d0 commit 1d84996

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

pljava-so/src/main/c/DualState.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ Java_org_postgresql_pljava_internal_DualState_00024SingleMemContextDelete__1memC
296296
JNIEnv* env, jobject _this, jlong pointer)
297297
{
298298
BEGIN_NATIVE_NO_ERRCHECK
299-
MemoryContextDelete(JLongGet(void *, pointer));
299+
MemoryContextDelete(JLongGet(MemoryContext, pointer));
300300
END_NATIVE
301301
}
302302

@@ -312,7 +312,7 @@ Java_org_postgresql_pljava_internal_DualState_00024SingleFreeTupleDesc__1freeTup
312312
JNIEnv* env, jobject _this, jlong pointer)
313313
{
314314
BEGIN_NATIVE_NO_ERRCHECK
315-
FreeTupleDesc(JLongGet(void *, pointer));
315+
FreeTupleDesc(JLongGet(TupleDesc, pointer));
316316
END_NATIVE
317317
}
318318

@@ -328,7 +328,7 @@ Java_org_postgresql_pljava_internal_DualState_00024SingleHeapFreeTuple__1heapFre
328328
JNIEnv* env, jobject _this, jlong pointer)
329329
{
330330
BEGIN_NATIVE_NO_ERRCHECK
331-
heap_freetuple(JLongGet(void *, pointer));
331+
heap_freetuple(JLongGet(HeapTuple, pointer));
332332
END_NATIVE
333333
}
334334

@@ -344,7 +344,7 @@ Java_org_postgresql_pljava_internal_DualState_00024SingleFreeErrorData__1freeErr
344344
JNIEnv* env, jobject _this, jlong pointer)
345345
{
346346
BEGIN_NATIVE_NO_ERRCHECK
347-
FreeErrorData(JLongGet(void *, pointer));
347+
FreeErrorData(JLongGet(ErrorData *, pointer));
348348
END_NATIVE
349349
}
350350

@@ -362,7 +362,7 @@ Java_org_postgresql_pljava_internal_DualState_00024SingleSPIfreeplan__1spiFreePl
362362
BEGIN_NATIVE_NO_ERRCHECK
363363
PG_TRY();
364364
{
365-
SPI_freeplan(JLongGet(void *, pointer));
365+
SPI_freeplan(JLongGet(SPIPlanPtr, pointer));
366366
}
367367
PG_CATCH();
368368
{
@@ -395,7 +395,7 @@ Java_org_postgresql_pljava_internal_DualState_00024SingleSPIcursorClose__1spiCur
395395
*/
396396
if ( NULL != currentInvocation && ! currentInvocation->errorOccurred
397397
&& ! currentInvocation->inExprContextCB )
398-
SPI_cursor_close(JLongGet(void *, pointer));
398+
SPI_cursor_close(JLongGet(Portal, pointer));
399399
}
400400
PG_CATCH();
401401
{

0 commit comments

Comments
 (0)