From 474a8a617251f6b5120dd7dd7e27009f0c18f033 Mon Sep 17 00:00:00 2001 From: Ced Naru Date: Sat, 14 Oct 2023 17:49:46 +0200 Subject: [PATCH] remove redundant write_return_value function --- src/memory/transfer_context.cpp | 6 +++--- src/memory/transfer_context.h | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/memory/transfer_context.cpp b/src/memory/transfer_context.cpp index b17a1f8c3c..eef7b542c0 100644 --- a/src/memory/transfer_context.cpp +++ b/src/memory/transfer_context.cpp @@ -77,7 +77,7 @@ uint32_t TransferContext::read_args(jni::Env& p_env, Variant* args) { } void TransferContext::write_return_value(jni::Env& p_env, Variant& variant) { - write_return_value(get_and_rewind_buffer(p_env), variant); + ktvariant::send_variant_to_buffer(variant, get_and_rewind_buffer(p_env)); } void TransferContext::icall(JNIEnv* rawEnv, jobject instance, jlong j_ptr, jint p_method_index, jint expectedReturnType) { @@ -121,7 +121,7 @@ void TransferContext::icall(JNIEnv* rawEnv, jobject instance, jlong j_ptr, jint const Variant& ret_value {methodBind->call(ptr, args_ptr, args_size, r_error)}; buffer->rewind(); - write_return_value(buffer, ret_value); + ktvariant::send_variant_to_buffer(ret_value, buffer); } else { Variant* args {variant_args + stack_offset}; read_args_to_array(buffer, args, args_size); @@ -134,7 +134,7 @@ void TransferContext::icall(JNIEnv* rawEnv, jobject instance, jlong j_ptr, jint stack_offset -= args_size; buffer->rewind(); - write_return_value(buffer, ret_value); + ktvariant::send_variant_to_buffer(ret_value, buffer); } #ifdef DEBUG_ENABLED diff --git a/src/memory/transfer_context.h b/src/memory/transfer_context.h index 206f32a5f2..b1c66d7dbb 100644 --- a/src/memory/transfer_context.h +++ b/src/memory/transfer_context.h @@ -48,10 +48,6 @@ class TransferContext : public JavaInstanceWrapper { } } - _FORCE_INLINE_ static void write_return_value(SharedBuffer* buffer, const Variant& r_ret) { - ktvariant::send_variant_to_buffer(r_ret, buffer); - } - // clang-format off DECLARE_JNI_METHODS( JNI_METHOD(GET_BUFFER, "getBuffer", "()Ljava/nio/ByteBuffer;")