Skip to content

Commit 0165af9

Browse files
committed
Be explicit about C return type returning pointers to Java
1 parent c740af8 commit 0165af9

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

java_strings.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ class CommonBase {
241241
(*env)->SetByteArrayRegion(env, ret_arr, 0, slice->datalen, slice->data);
242242
return ret_arr;
243243
}
244-
JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_bytes_1to_1u8_1vec (JNIEnv * env, jclass _b, jbyteArray bytes) {
244+
JNIEXPORT int64_t impl_bindings_bytes_1to_1u8_1vec (JNIEnv * env, jclass _b, jbyteArray bytes) {
245245
LDKCVec_u8Z *vec = (LDKCVec_u8Z*)MALLOC(sizeof(LDKCVec_u8Z), "LDKCVec_u8");
246246
vec->datalen = (*env)->GetArrayLength(env, bytes);
247247
vec->data = (uint8_t*)MALLOC(vec->datalen, "LDKCVec_u8Z Bytes");
@@ -255,7 +255,7 @@ class CommonBase {
255255
slice.datalen = txdata->datalen;
256256
return Java_org_ldk_impl_bindings_get_1u8_1slice_1bytes(env, _b, (long)&slice);
257257
}
258-
JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_new_1txpointer_1copy_1data (JNIEnv * env, jclass _b, jbyteArray bytes) {
258+
JNIEXPORT int64_t JNICALL Java_org_ldk_impl_bindings_new_1txpointer_1copy_1data (JNIEnv * env, jclass _b, jbyteArray bytes) {
259259
LDKTransaction *txdata = (LDKTransaction*)MALLOC(sizeof(LDKTransaction), "LDKTransaction");
260260
txdata->datalen = (*env)->GetArrayLength(env, bytes);
261261
txdata->data = (uint8_t*)MALLOC(txdata->datalen, "Tx Data Bytes");
@@ -278,7 +278,7 @@ class CommonBase {
278278
LDKCVec_u8Z *vec = (LDKCVec_u8Z*)ptr;
279279
return (long)vec->datalen;
280280
}
281-
JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_new_1empty_1slice_1vec (JNIEnv * env, jclass _b) {
281+
JNIEXPORT int64_t JNICALL Java_org_ldk_impl_bindings_new_1empty_1slice_1vec (JNIEnv * env, jclass _b) {
282282
// Check sizes of a few Vec types are all consistent as we're meant to be generic across types
283283
_Static_assert(sizeof(LDKCVec_u8Z) == sizeof(LDKCVec_SignatureZ), "Vec<*> needs to be mapped identically");
284284
_Static_assert(sizeof(LDKCVec_u8Z) == sizeof(LDKCVec_MessageSendEventZ), "Vec<*> needs to be mapped identically");
@@ -727,7 +727,7 @@ def native_c_map_trait(self, struct_name, field_vars, field_fns):
727727
out_c = out_c + "\treturn ret;\n"
728728
out_c = out_c + "}\n"
729729

730-
out_c = out_c + self.c_fn_ty_pfx + "long " + self.c_fn_name_define_pfx(struct_name + "_new", True) + "jobject o"
730+
out_c = out_c + self.c_fn_ty_pfx + "int64_t " + self.c_fn_name_define_pfx(struct_name + "_new", True) + "jobject o"
731731
for var in field_vars:
732732
if isinstance(var, ConvInfo):
733733
out_c = out_c + ", " + var.c_ty + " " + var.arg_name

0 commit comments

Comments
 (0)