[gjs: 8/10] function: Factor out repeated call to Argument::return_type()
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs: 8/10] function: Factor out repeated call to Argument::return_type()
- Date: Fri, 4 Feb 2022 05:31:03 +0000 (UTC)
commit 0e0dc17077cdc2309c1a3a237e857a3121dd0eae
Author: Marco Trevisan (TreviƱo) <mail 3v1n0 net>
Date: Mon Oct 26 21:18:27 2020 +0100
function: Factor out repeated call to Argument::return_type()
gi/function.cpp | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/gi/function.cpp b/gi/function.cpp
index effdc9bc0..f39dc1727 100644
--- a/gi/function.cpp
+++ b/gi/function.cpp
@@ -962,8 +962,9 @@ bool Function::invoke(JSContext* context, const JS::CallArgs& args,
g_assert_cmpuint(ffi_arg_pos, ==, ffi_argc);
g_assert_cmpuint(gi_arg_pos, ==, state.gi_argc);
- return_value_p = get_return_ffi_pointer_from_giargument(
- m_arguments.return_type(), &return_value);
+ GITypeInfo* return_type = m_arguments.return_type();
+ return_value_p =
+ get_return_ffi_pointer_from_giargument(return_type, &return_value);
ffi_call(&m_invoker.cif, FFI_FN(m_invoker.native_address), return_value_p,
ffi_arg_pointers.get());
@@ -973,9 +974,9 @@ bool Function::invoke(JSContext* context, const JS::CallArgs& args,
if (!r_value)
args.rval().setUndefined();
- if (m_arguments.return_type()) {
- gi_type_info_extract_ffi_return_value(
- m_arguments.return_type(), &return_value, state.return_value());
+ if (return_type) {
+ gi_type_info_extract_ffi_return_value(return_type, &return_value,
+ state.return_value());
}
// Process out arguments and return values. This loop is skipped if we fail
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]