[pygobject] Remove dead code for marshalling array lengths in the context of vfuncs
- From: Simon Feltman <sfeltman src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pygobject] Remove dead code for marshalling array lengths in the context of vfuncs
- Date: Mon, 18 Aug 2014 05:23:32 +0000 (UTC)
commit 3270dad356c44f5fef7571a9f29b22e7c293fa2c
Author: Simon Feltman <sfeltman src gnome org>
Date: Sun Aug 17 13:58:10 2014 -0700
Remove dead code for marshalling array lengths in the context of vfuncs
Remove usage of the args parameter from _pygi_argument_to_array. This is no
longer used because array marshalling for vfuncs is now handled by the cached
marshaller.
https://bugzilla.gnome.org/show_bug.cgi?id=688792
gi/pygi-argument.c | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
---
diff --git a/gi/pygi-argument.c b/gi/pygi-argument.c
index cf26808..035c8d9 100644
--- a/gi/pygi-argument.c
+++ b/gi/pygi-argument.c
@@ -819,8 +819,9 @@ _pygi_argument_to_array (GIArgument *arg,
gint length_arg_pos;
GIArgInfo length_arg_info;
GITypeInfo length_type_info;
+ GIArgument length_arg;
- if (G_UNLIKELY (args == NULL && args_values == NULL)) {
+ if (G_UNLIKELY (args_values == NULL)) {
g_critical ("Unable to determine array length for %p",
arg->v_pointer);
g_array = g_array_new (is_zero_terminated, FALSE, item_size);
@@ -834,20 +835,13 @@ _pygi_argument_to_array (GIArgument *arg,
g_callable_info_load_arg (callable_info, length_arg_pos, &length_arg_info);
g_arg_info_load_type (&length_arg_info, &length_type_info);
- if (args != NULL) {
- if (!gi_argument_to_gssize (args[length_arg_pos],
- g_type_info_get_tag (&length_type_info),
- &length))
- return NULL;
- } else {
- /* get it from args_values */
- GIArgument length_arg = _pygi_argument_from_g_value (&(args_values[length_arg_pos]),
- &length_type_info);
- if (!gi_argument_to_gssize (&length_arg,
- g_type_info_get_tag (&length_type_info),
- &length))
- return NULL;
- }
+
+ length_arg = _pygi_argument_from_g_value (&(args_values[length_arg_pos]),
+ &length_type_info);
+ if (!gi_argument_to_gssize (&length_arg,
+ g_type_info_get_tag (&length_type_info),
+ &length))
+ return NULL;
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]