luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-30 19:06:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

girepository: Fix various precondition failure return values to typecheck

Browse Source 
This fixes various `-Wsign-conversion` warnings in `giarginfo.c` and
related files.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>

Helps: #3405
This commit is contained in:
Philip Withnall
2025-04-23 00:01:50 +01:00
parent cdca951d06
commit c76b9bc72e
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
girepository/giarginfo.c
View File

@@ -60,8 +60,8 @@ gi_arg_info_get_direction (GIArgInfo *info)
GIRealInfo *rinfo = (GIRealInfo *)info; GIRealInfo *rinfo = (GIRealInfo *)info;
ArgBlob *blob; ArgBlob *blob;
g_return_val_if_fail (info != NULL, -1); g_return_val_if_fail (info != NULL, GI_DIRECTION_OUT);
g_return_val_if_fail (GI_IS_ARG_INFO (info), -1); g_return_val_if_fail (GI_IS_ARG_INFO (info), GI_DIRECTION_OUT);
blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset];
@@ -218,8 +218,8 @@ gi_arg_info_get_ownership_transfer (GIArgInfo *info)
GIRealInfo *rinfo = (GIRealInfo *)info; GIRealInfo *rinfo = (GIRealInfo *)info;
ArgBlob *blob; ArgBlob *blob;
g_return_val_if_fail (info != NULL, -1); g_return_val_if_fail (info != NULL, GI_TRANSFER_NOTHING);
g_return_val_if_fail (GI_IS_ARG_INFO (info), -1); g_return_val_if_fail (GI_IS_ARG_INFO (info), GI_TRANSFER_NOTHING);
blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset];
@@ -251,8 +251,8 @@ gi_arg_info_get_scope (GIArgInfo *info)
GIRealInfo *rinfo = (GIRealInfo *)info; GIRealInfo *rinfo = (GIRealInfo *)info;
ArgBlob *blob; ArgBlob *blob;
g_return_val_if_fail (info != NULL, -1); g_return_val_if_fail (info != NULL, GI_SCOPE_TYPE_INVALID);
g_return_val_if_fail (GI_IS_ARG_INFO (info), -1); g_return_val_if_fail (GI_IS_ARG_INFO (info), GI_SCOPE_TYPE_INVALID);
blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset];

8
girepository/gicallableinfo.c
View File

@@ -297,8 +297,8 @@ gi_callable_info_get_caller_owns (GICallableInfo *info)
GIRealInfo *rinfo = (GIRealInfo*) info; GIRealInfo *rinfo = (GIRealInfo*) info;
SignatureBlob *blob; SignatureBlob *blob;
g_return_val_if_fail (info != NULL, -1); g_return_val_if_fail (info != NULL, GI_TRANSFER_NOTHING);
g_return_val_if_fail (GI_IS_CALLABLE_INFO (info), -1); g_return_val_if_fail (GI_IS_CALLABLE_INFO (info), GI_TRANSFER_NOTHING);
blob = (SignatureBlob *)&rinfo->typelib->data[signature_offset (info)]; blob = (SignatureBlob *)&rinfo->typelib->data[signature_offset (info)];
@@ -327,8 +327,8 @@ gi_callable_info_get_instance_ownership_transfer (GICallableInfo *info)
GIRealInfo *rinfo = (GIRealInfo*) info; GIRealInfo *rinfo = (GIRealInfo*) info;
SignatureBlob *blob; SignatureBlob *blob;
g_return_val_if_fail (info != NULL, -1); g_return_val_if_fail (info != NULL, GI_TRANSFER_NOTHING);
g_return_val_if_fail (GI_IS_CALLABLE_INFO (info), -1); g_return_val_if_fail (GI_IS_CALLABLE_INFO (info), GI_TRANSFER_NOTHING);
blob = (SignatureBlob *)&rinfo->typelib->data[signature_offset (info)]; blob = (SignatureBlob *)&rinfo->typelib->data[signature_offset (info)];

4
girepository/gifunctioninfo.c
View File

@@ -116,8 +116,8 @@ gi_function_info_get_flags (GIFunctionInfo *info)
GIRealInfo *rinfo; GIRealInfo *rinfo;
FunctionBlob *blob; FunctionBlob *blob;
g_return_val_if_fail (info != NULL, -1); g_return_val_if_fail (info != NULL, 0);
g_return_val_if_fail (GI_IS_FUNCTION_INFO (info), -1); g_return_val_if_fail (GI_IS_FUNCTION_INFO (info), 0);
rinfo = (GIRealInfo *)info; rinfo = (GIRealInfo *)info;
blob = (FunctionBlob *)&rinfo->typelib->data[rinfo->offset]; blob = (FunctionBlob *)&rinfo->typelib->data[rinfo->offset];

4
girepository/gipropertyinfo.c
View File

@@ -124,8 +124,8 @@ gi_property_info_get_ownership_transfer (GIPropertyInfo *info)
GIRealInfo *rinfo = (GIRealInfo *)info; GIRealInfo *rinfo = (GIRealInfo *)info;
PropertyBlob *blob; PropertyBlob *blob;
g_return_val_if_fail (info != NULL, -1); g_return_val_if_fail (info != NULL, GI_TRANSFER_NOTHING);
g_return_val_if_fail (GI_IS_PROPERTY_INFO (info), -1); g_return_val_if_fail (GI_IS_PROPERTY_INFO (info), GI_TRANSFER_NOTHING);
blob = (PropertyBlob *)&rinfo->typelib->data[rinfo->offset]; blob = (PropertyBlob *)&rinfo->typelib->data[rinfo->offset];

6
girepository/gitypeinfo.c
View File

@@ -373,15 +373,15 @@ gi_type_info_get_array_type (GITypeInfo *info)
GIRealInfo *rinfo = (GIRealInfo *)info; GIRealInfo *rinfo = (GIRealInfo *)info;
SimpleTypeBlob *type; SimpleTypeBlob *type;
g_return_val_if_fail (info != NULL, -1); g_return_val_if_fail (info != NULL, GI_ARRAY_TYPE_C);
g_return_val_if_fail (GI_IS_TYPE_INFO (info), -1); g_return_val_if_fail (GI_IS_TYPE_INFO (info), GI_ARRAY_TYPE_C);
type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset]; type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset];
if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0)) if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0))
{ {
ArrayTypeBlob *blob = (ArrayTypeBlob *)&rinfo->typelib->data[rinfo->offset]; ArrayTypeBlob *blob = (ArrayTypeBlob *)&rinfo->typelib->data[rinfo->offset];
g_return_val_if_fail (blob->tag == GI_TYPE_TAG_ARRAY, -1); g_return_val_if_fail (blob->tag == GI_TYPE_TAG_ARRAY, GI_ARRAY_TYPE_C);
return blob->array_type; return blob->array_type;
} }