From c76b9bc72ebcd99ff274d40c967035e54f650d98 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 23 Apr 2025 00:01:50 +0100 Subject: [PATCH] girepository: Fix various precondition failure return values to typecheck This fixes various `-Wsign-conversion` warnings in `giarginfo.c` and related files. Signed-off-by: Philip Withnall Helps: #3405 --- girepository/giarginfo.c | 12 ++++++------ girepository/gicallableinfo.c | 8 ++++---- girepository/gifunctioninfo.c | 4 ++-- girepository/gipropertyinfo.c | 4 ++-- girepository/gitypeinfo.c | 6 +++--- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/girepository/giarginfo.c b/girepository/giarginfo.c index 5d048377e..775e0d62c 100644 --- a/girepository/giarginfo.c +++ b/girepository/giarginfo.c @@ -60,8 +60,8 @@ gi_arg_info_get_direction (GIArgInfo *info) GIRealInfo *rinfo = (GIRealInfo *)info; ArgBlob *blob; - g_return_val_if_fail (info != NULL, -1); - g_return_val_if_fail (GI_IS_ARG_INFO (info), -1); + g_return_val_if_fail (info != NULL, GI_DIRECTION_OUT); + g_return_val_if_fail (GI_IS_ARG_INFO (info), GI_DIRECTION_OUT); blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; @@ -218,8 +218,8 @@ gi_arg_info_get_ownership_transfer (GIArgInfo *info) GIRealInfo *rinfo = (GIRealInfo *)info; ArgBlob *blob; - g_return_val_if_fail (info != NULL, -1); - g_return_val_if_fail (GI_IS_ARG_INFO (info), -1); + g_return_val_if_fail (info != NULL, GI_TRANSFER_NOTHING); + g_return_val_if_fail (GI_IS_ARG_INFO (info), GI_TRANSFER_NOTHING); blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; @@ -251,8 +251,8 @@ gi_arg_info_get_scope (GIArgInfo *info) GIRealInfo *rinfo = (GIRealInfo *)info; ArgBlob *blob; - g_return_val_if_fail (info != NULL, -1); - g_return_val_if_fail (GI_IS_ARG_INFO (info), -1); + g_return_val_if_fail (info != NULL, GI_SCOPE_TYPE_INVALID); + g_return_val_if_fail (GI_IS_ARG_INFO (info), GI_SCOPE_TYPE_INVALID); blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; diff --git a/girepository/gicallableinfo.c b/girepository/gicallableinfo.c index 48b1fc679..2564b23e1 100644 --- a/girepository/gicallableinfo.c +++ b/girepository/gicallableinfo.c @@ -297,8 +297,8 @@ gi_callable_info_get_caller_owns (GICallableInfo *info) GIRealInfo *rinfo = (GIRealInfo*) info; SignatureBlob *blob; - g_return_val_if_fail (info != NULL, -1); - g_return_val_if_fail (GI_IS_CALLABLE_INFO (info), -1); + g_return_val_if_fail (info != NULL, GI_TRANSFER_NOTHING); + g_return_val_if_fail (GI_IS_CALLABLE_INFO (info), GI_TRANSFER_NOTHING); 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; SignatureBlob *blob; - g_return_val_if_fail (info != NULL, -1); - g_return_val_if_fail (GI_IS_CALLABLE_INFO (info), -1); + g_return_val_if_fail (info != NULL, GI_TRANSFER_NOTHING); + g_return_val_if_fail (GI_IS_CALLABLE_INFO (info), GI_TRANSFER_NOTHING); blob = (SignatureBlob *)&rinfo->typelib->data[signature_offset (info)]; diff --git a/girepository/gifunctioninfo.c b/girepository/gifunctioninfo.c index 79afc26fd..388464598 100644 --- a/girepository/gifunctioninfo.c +++ b/girepository/gifunctioninfo.c @@ -116,8 +116,8 @@ gi_function_info_get_flags (GIFunctionInfo *info) GIRealInfo *rinfo; FunctionBlob *blob; - g_return_val_if_fail (info != NULL, -1); - g_return_val_if_fail (GI_IS_FUNCTION_INFO (info), -1); + g_return_val_if_fail (info != NULL, 0); + g_return_val_if_fail (GI_IS_FUNCTION_INFO (info), 0); rinfo = (GIRealInfo *)info; blob = (FunctionBlob *)&rinfo->typelib->data[rinfo->offset]; diff --git a/girepository/gipropertyinfo.c b/girepository/gipropertyinfo.c index 9aaed45da..ccc61e0c3 100644 --- a/girepository/gipropertyinfo.c +++ b/girepository/gipropertyinfo.c @@ -124,8 +124,8 @@ gi_property_info_get_ownership_transfer (GIPropertyInfo *info) GIRealInfo *rinfo = (GIRealInfo *)info; PropertyBlob *blob; - g_return_val_if_fail (info != NULL, -1); - g_return_val_if_fail (GI_IS_PROPERTY_INFO (info), -1); + g_return_val_if_fail (info != NULL, GI_TRANSFER_NOTHING); + g_return_val_if_fail (GI_IS_PROPERTY_INFO (info), GI_TRANSFER_NOTHING); blob = (PropertyBlob *)&rinfo->typelib->data[rinfo->offset]; diff --git a/girepository/gitypeinfo.c b/girepository/gitypeinfo.c index e07ab8e9d..6cfdb9bae 100644 --- a/girepository/gitypeinfo.c +++ b/girepository/gitypeinfo.c @@ -373,15 +373,15 @@ gi_type_info_get_array_type (GITypeInfo *info) GIRealInfo *rinfo = (GIRealInfo *)info; SimpleTypeBlob *type; - g_return_val_if_fail (info != NULL, -1); - g_return_val_if_fail (GI_IS_TYPE_INFO (info), -1); + g_return_val_if_fail (info != NULL, GI_ARRAY_TYPE_C); + g_return_val_if_fail (GI_IS_TYPE_INFO (info), GI_ARRAY_TYPE_C); type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset]; if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0)) { 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; }