luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-12 21:36:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

girepository: Rename gi_arg_info_load_type() to gi_arg_info_load_type_info()

Browse Source 
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 <pwithnall@gnome.org>

Fixes: #3243
This commit is contained in:
Philip Withnall 2024-02-05 15:13:46 +00:00
parent bcc22d48b0
commit c8132fdf78
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
girepository/giarginfo.c
View File

@ -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;

2
girepository/giarginfo.h
View File

@ -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

3
girepository/girepository-private.h
View File

@ -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);

2
girepository/girffi.c
View File

@ -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:

2
girepository/tests/repository.c
View File

@ -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));