From c8132fdf78da6fe621bde0c2f9a8bd3eadff6ede Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Mon, 5 Feb 2024 15:13:46 +0000 Subject: [PATCH] girepository: Rename gi_arg_info_load_type() to gi_arg_info_load_type_info() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit So that it matches `gi_arg_info_get_type_info()`. We can’t use `gi_arg_info_get_type()` because that collides with the `GType` getter for the type. Spotted by Philip Chimento. Signed-off-by: Philip Withnall Fixes: #3243 --- girepository/giarginfo.c | 6 +++--- girepository/giarginfo.h | 2 +- girepository/girepository-private.h | 3 ++- girepository/girffi.c | 2 +- girepository/tests/repository.c | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/girepository/giarginfo.c b/girepository/giarginfo.c index 11302d416..8728fd0d6 100644 --- a/girepository/giarginfo.c +++ b/girepository/giarginfo.c @@ -344,7 +344,7 @@ gi_arg_info_get_type_info (GIArgInfo *info) } /** - * gi_arg_info_load_type: + * gi_arg_info_load_type_info: * @info: a #GIArgInfo * @type: (out caller-allocates): Initialized with information about type of @info * @@ -360,8 +360,8 @@ gi_arg_info_get_type_info (GIArgInfo *info) * Since: 2.80 */ void -gi_arg_info_load_type (GIArgInfo *info, - GITypeInfo *type) +gi_arg_info_load_type_info (GIArgInfo *info, + GITypeInfo *type) { GIRealInfo *rinfo = (GIRealInfo*) info; diff --git a/girepository/giarginfo.h b/girepository/giarginfo.h index 5223f2517..e7a61b1dd 100644 --- a/girepository/giarginfo.h +++ b/girepository/giarginfo.h @@ -95,6 +95,6 @@ GI_AVAILABLE_IN_ALL GITypeInfo * gi_arg_info_get_type_info (GIArgInfo *info); GI_AVAILABLE_IN_ALL -void gi_arg_info_load_type (GIArgInfo *info, +void gi_arg_info_load_type_info (GIArgInfo *info, GITypeInfo *type); G_END_DECLS diff --git a/girepository/girepository-private.h b/girepository/girepository-private.h index 6e48e1ee4..b33c70149 100644 --- a/girepository/girepository-private.h +++ b/girepository/girepository-private.h @@ -211,7 +211,8 @@ void gi_arg_info_class_init (gpointer g_class, gpointer class_data); /* GITypeInfo is stack-allocatable so it can be used with - * gi_arg_info_load_type(), so its definition is actually public in gitypes.h. */ + * gi_arg_info_load_type_info(), so its definition is actually public in + * gitypes.h. */ void gi_type_info_class_init (gpointer g_class, gpointer class_data); diff --git a/girepository/girffi.c b/girepository/girffi.c index 852358e0c..4040b32b2 100644 --- a/girepository/girffi.c +++ b/girepository/girffi.c @@ -207,7 +207,7 @@ gi_callable_info_get_ffi_arg_types (GICallableInfo *callable_info, GITypeInfo arg_type; gi_callable_info_load_arg (callable_info, i, &arg_info); - gi_arg_info_load_type (&arg_info, &arg_type); + gi_arg_info_load_type_info (&arg_info, &arg_type); switch (gi_arg_info_get_direction (&arg_info)) { case GI_DIRECTION_IN: diff --git a/girepository/tests/repository.c b/girepository/tests/repository.c index 822eb2ff9..7870c6242 100644 --- a/girepository/tests/repository.c +++ b/girepository/tests/repository.c @@ -199,7 +199,7 @@ test_repository_arg_info (RepositoryFixture *fx, g_assert_true (gi_type_info_is_pointer (type_info)); g_assert_cmpint (gi_type_info_get_tag (type_info), ==, GI_TYPE_TAG_UTF8); - gi_arg_info_load_type (arg_info, &type_info_stack); + gi_arg_info_load_type_info (arg_info, &type_info_stack); g_assert_true (gi_type_info_is_pointer (&type_info_stack) == gi_type_info_is_pointer (type_info)); g_assert_cmpint (gi_type_info_get_tag (&type_info_stack), ==, gi_type_info_get_tag (type_info));