From bc2e4b3de5af7ce15a621693dade9edbfecb3245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 16 Jan 2024 00:35:23 +0100 Subject: [PATCH] girrepository: Replace usage of gsize with standard size_t We just do a safe s/gsize/size_t/ replacement here without doing any changes to places in which different size of size_t and gsize may be actually different and create troubles. --- girepository/gdump.c | 10 +++++----- girepository/gibaseinfo-private.h | 2 +- girepository/gibaseinfo.c | 8 ++++---- girepository/gicallableinfo.c | 6 +++--- girepository/gicallableinfo.h | 4 ++-- girepository/giconstantinfo.c | 4 ++-- girepository/giconstantinfo.h | 2 +- girepository/gifieldinfo.c | 6 +++--- girepository/gifieldinfo.h | 4 ++-- girepository/gifunctioninfo.c | 4 ++-- girepository/gifunctioninfo.h | 4 ++-- girepository/girepository.c | 2 +- girepository/girepository.h | 2 +- girepository/girmodule.c | 4 ++-- girepository/girparser.c | 2 +- girepository/girwriter.c | 2 +- girepository/gistructinfo.c | 4 ++-- girepository/gistructinfo.h | 4 ++-- girepository/gitypelib-internal.h | 2 +- girepository/gitypelib.c | 23 +++++++++++------------ girepository/gitypelib.h | 4 ++-- girepository/gitypes.h | 2 +- girepository/giunioninfo.c | 4 ++-- girepository/giunioninfo.h | 4 ++-- girepository/givfuncinfo.c | 4 ++-- girepository/givfuncinfo.h | 4 ++-- 26 files changed, 60 insertions(+), 61 deletions(-) diff --git a/girepository/gdump.c b/girepository/gdump.c index 6877ca24c..2388626d8 100644 --- a/girepository/gdump.c +++ b/girepository/gdump.c @@ -44,8 +44,8 @@ static gboolean write_all (FILE *out, const void *buffer, - gsize count, - gsize *bytes_written, + size_t count, + size_t *bytes_written, GError **error) { size_t ret; @@ -104,7 +104,7 @@ escaped_printf (FILE *out, const char *fmt, ...) { char *str; va_list args; - gsize written; + size_t written; GError *error = NULL; va_start (args, fmt); @@ -123,7 +123,7 @@ escaped_printf (FILE *out, const char *fmt, ...) static void goutput_write (FILE *out, const char *str) { - gsize written; + size_t written; GError *error = NULL; if (!write_all (out, str, strlen (str), &written, &error)) { @@ -662,7 +662,7 @@ gi_repository_dump (const char *input_filename, while (TRUE) { - gsize len; + size_t len; char *line = read_line (input, &len); const char *function; diff --git a/girepository/gibaseinfo-private.h b/girepository/gibaseinfo-private.h index 4d583538e..a756f7072 100644 --- a/girepository/gibaseinfo-private.h +++ b/girepository/gibaseinfo-private.h @@ -45,7 +45,7 @@ struct _GIBaseInfoClass void gi_base_info_init_types (void); GType gi_base_info_type_register_static (const char *type_name, - gsize instance_size, + size_t instance_size, GClassInitFunc class_init); G_END_DECLS diff --git a/girepository/gibaseinfo.c b/girepository/gibaseinfo.c index 85bf3c26c..4c34355de 100644 --- a/girepository/gibaseinfo.c +++ b/girepository/gibaseinfo.c @@ -213,7 +213,7 @@ gi_base_info_get_type (void) */ GType gi_base_info_type_register_static (const char *type_name, - gsize instance_size, + size_t instance_size, GClassInitFunc class_init) { GTypeInfo info; @@ -264,7 +264,7 @@ GI_DEFINE_BASE_INFO_TYPE (gi_unresolved_info, GI_INFO_TYPE_UNRESOLVED) void gi_base_info_init_types (void) { - static gsize register_types_once = 0; + static size_t register_types_once = 0; if (g_once_init_enter (®ister_types_once)) { @@ -272,7 +272,7 @@ gi_base_info_init_types (void) { GIInfoType info_type; const char *type_name; - gsize instance_size; + size_t instance_size; GClassInitFunc class_init; } types[] = @@ -297,7 +297,7 @@ gi_base_info_init_types (void) { GI_INFO_TYPE_UNRESOLVED, "GIUnresolvedInfo", sizeof (GIUnresolvedInfo), gi_unresolved_info_class_init }, }; - for (gsize i = 0; i < G_N_ELEMENTS (types); i++) + for (size_t i = 0; i < G_N_ELEMENTS (types); i++) { GType registered_type = gi_base_info_type_register_static (g_intern_static_string (types[i].type_name), types[i].instance_size, diff --git a/girepository/gicallableinfo.c b/girepository/gicallableinfo.c index 9eccfc2a7..1c170a9db 100644 --- a/girepository/gicallableinfo.c +++ b/girepository/gicallableinfo.c @@ -631,9 +631,9 @@ gboolean gi_callable_info_invoke (GICallableInfo *info, void *function, const GIArgument *in_args, - gsize n_in_args, + size_t n_in_args, GIArgument *out_args, - gsize n_out_args, + size_t n_out_args, GIArgument *return_value, GError **error) { @@ -644,7 +644,7 @@ gi_callable_info_invoke (GICallableInfo *info, GITypeInfo *rinfo; GITypeTag rtag; GIArgInfo *ainfo; - gsize n_args, n_invoke_args, in_pos, out_pos, i; + size_t n_args, n_invoke_args, in_pos, out_pos, i; void **args; gboolean success = FALSE; GError *local_error = NULL; diff --git a/girepository/gicallableinfo.h b/girepository/gicallableinfo.h index 3ff1c0450..5f057ab8a 100644 --- a/girepository/gicallableinfo.h +++ b/girepository/gicallableinfo.h @@ -95,9 +95,9 @@ GI_AVAILABLE_IN_ALL gboolean gi_callable_info_invoke (GICallableInfo *info, void *function, const GIArgument *in_args, - gsize n_in_args, + size_t n_in_args, GIArgument *out_args, - gsize n_out_args, + size_t n_out_args, GIArgument *return_value, GError **error); diff --git a/girepository/giconstantinfo.c b/girepository/giconstantinfo.c index e16aca8fe..efe7d853a 100644 --- a/girepository/giconstantinfo.c +++ b/girepository/giconstantinfo.c @@ -116,7 +116,7 @@ gi_constant_info_free_value (GIConstantInfo *info, * Returns: size of the constant, in bytes * Since: 2.80 */ -gsize +size_t gi_constant_info_get_value (GIConstantInfo *info, GIArgument *value) { @@ -133,7 +133,7 @@ gi_constant_info_get_value (GIConstantInfo *info, { if (blob->type.flags.pointer) { - gsize blob_size = blob->size; + size_t blob_size = blob->size; value->v_pointer = g_memdup2 (&rinfo->typelib->data[blob->offset], blob_size); } diff --git a/girepository/giconstantinfo.h b/girepository/giconstantinfo.h index c28c5ddbf..5885d5465 100644 --- a/girepository/giconstantinfo.h +++ b/girepository/giconstantinfo.h @@ -52,6 +52,6 @@ void gi_constant_info_free_value (GIConstantInfo *info, GIArgument *value); GI_AVAILABLE_IN_ALL -gsize gi_constant_info_get_value (GIConstantInfo *info, +size_t gi_constant_info_get_value (GIConstantInfo *info, GIArgument *value); G_END_DECLS diff --git a/girepository/gifieldinfo.c b/girepository/gifieldinfo.c index 9abc1ae40..69c0fec20 100644 --- a/girepository/gifieldinfo.c +++ b/girepository/gifieldinfo.c @@ -95,7 +95,7 @@ gi_field_info_get_flags (GIFieldInfo *info) * Returns: the field size, in bits * Since: 2.80 */ -gsize +size_t gi_field_info_get_size (GIFieldInfo *info) { GIRealInfo *rinfo = (GIRealInfo *)info; @@ -119,7 +119,7 @@ gi_field_info_get_size (GIFieldInfo *info) * Returns: the field offset, in bytes * Since: 2.80 */ -gsize +size_t gi_field_info_get_offset (GIFieldInfo *info) { GIRealInfo *rinfo = (GIRealInfo *)info; @@ -433,7 +433,7 @@ gi_field_info_set_field (GIFieldInfo *field_info, result = TRUE; break; case GI_TYPE_TAG_GTYPE: - G_STRUCT_MEMBER (gsize, mem, offset) = value->v_size; + G_STRUCT_MEMBER (size_t, mem, offset) = value->v_size; result = TRUE; break; case GI_TYPE_TAG_FLOAT: diff --git a/girepository/gifieldinfo.h b/girepository/gifieldinfo.h index c7df49e54..9ac6449b6 100644 --- a/girepository/gifieldinfo.h +++ b/girepository/gifieldinfo.h @@ -48,10 +48,10 @@ GI_AVAILABLE_IN_ALL GIFieldInfoFlags gi_field_info_get_flags (GIFieldInfo *info); GI_AVAILABLE_IN_ALL -gsize gi_field_info_get_size (GIFieldInfo *info); +size_t gi_field_info_get_size (GIFieldInfo *info); GI_AVAILABLE_IN_ALL -gsize gi_field_info_get_offset (GIFieldInfo *info); +size_t gi_field_info_get_offset (GIFieldInfo *info); GI_AVAILABLE_IN_ALL GITypeInfo * gi_field_info_get_type_info (GIFieldInfo *info); diff --git a/girepository/gifunctioninfo.c b/girepository/gifunctioninfo.c index 525cd1ba1..74f49020c 100644 --- a/girepository/gifunctioninfo.c +++ b/girepository/gifunctioninfo.c @@ -266,9 +266,9 @@ gi_invoke_error_quark (void) gboolean gi_function_info_invoke (GIFunctionInfo *info, const GIArgument *in_args, - gsize n_in_args, + size_t n_in_args, GIArgument *out_args, - gsize n_out_args, + size_t n_out_args, GIArgument *return_value, GError **error) { diff --git a/girepository/gifunctioninfo.h b/girepository/gifunctioninfo.h index aa799dc90..9a9f52551 100644 --- a/girepository/gifunctioninfo.h +++ b/girepository/gifunctioninfo.h @@ -92,9 +92,9 @@ typedef enum GI_AVAILABLE_IN_ALL gboolean gi_function_info_invoke (GIFunctionInfo *info, const GIArgument *in_args, - gsize n_in_args, + size_t n_in_args, GIArgument *out_args, - gsize n_out_args, + size_t n_out_args, GIArgument *return_value, GError **error); diff --git a/girepository/girepository.c b/girepository/girepository.c index 2d08047af..74842e4ea 100644 --- a/girepository/girepository.c +++ b/girepository/girepository.c @@ -1071,7 +1071,7 @@ gi_repository_find_by_error_domain (GIRepository *repository, void gi_repository_get_object_gtype_interfaces (GIRepository *repository, GType gtype, - gsize *n_interfaces_out, + size_t *n_interfaces_out, GIInterfaceInfo ***interfaces_out) { GTypeInterfaceCache *cache; diff --git a/girepository/girepository.h b/girepository/girepository.h index cac9413a8..52ef28a8d 100644 --- a/girepository/girepository.h +++ b/girepository/girepository.h @@ -165,7 +165,7 @@ GIBaseInfo * gi_repository_find_by_gtype (GIRepository *repository, GI_AVAILABLE_IN_ALL void gi_repository_get_object_gtype_interfaces (GIRepository *repository, GType gtype, - gsize *n_interfaces_out, + size_t *n_interfaces_out, GIInterfaceInfo ***interfaces_out); GI_AVAILABLE_IN_ALL diff --git a/girepository/girmodule.c b/girepository/girmodule.c index 9ed3a7509..5e9b3d2c5 100644 --- a/girepository/girmodule.c +++ b/girepository/girmodule.c @@ -319,8 +319,8 @@ gi_ir_module_build_typelib (GIIrModule *module) { GError *error = NULL; GITypelib *typelib; - gsize length; - unsigned int i; + size_t length; + size_t i; GList *e; Header *header; DirEntry *entry; diff --git a/girepository/girparser.c b/girepository/girparser.c index f0336a2e2..d23035aec 100644 --- a/girepository/girparser.c +++ b/girepository/girparser.c @@ -433,7 +433,7 @@ static GIIrNodeType * parse_type_internal (GIIrModule *module, typedef struct { const char *str; - unsigned int size; + size_t size; unsigned int is_signed : 1; } IntegerAliasInfo; diff --git a/girepository/girwriter.c b/girepository/girwriter.c index c9dcc7f0e..869412aed 100644 --- a/girepository/girwriter.c +++ b/girepository/girwriter.c @@ -1249,7 +1249,7 @@ write_union_info (const char *ns, const char *type_init; const char *func; gboolean deprecated; - gsize size; + size_t size; name = gi_base_info_get_name ((GIBaseInfo *)info); deprecated = gi_base_info_is_deprecated ((GIBaseInfo *)info); diff --git a/girepository/gistructinfo.c b/girepository/gistructinfo.c index e06e78d8a..cf4e0f94f 100644 --- a/girepository/gistructinfo.c +++ b/girepository/gistructinfo.c @@ -232,7 +232,7 @@ gi_struct_info_find_method (GIStructInfo *info, * Returns: size of the structure, in bytes * Since: 2.80 */ -gsize +size_t gi_struct_info_get_size (GIStructInfo *info) { GIRealInfo *rinfo = (GIRealInfo *)info; @@ -250,7 +250,7 @@ gi_struct_info_get_size (GIStructInfo *info) * Returns: required alignment, in bytes * Since: 2.80 */ -gsize +size_t gi_struct_info_get_alignment (GIStructInfo *info) { GIRealInfo *rinfo = (GIRealInfo *)info; diff --git a/girepository/gistructinfo.h b/girepository/gistructinfo.h index 95a30d80e..eaab4f42e 100644 --- a/girepository/gistructinfo.h +++ b/girepository/gistructinfo.h @@ -67,10 +67,10 @@ GIFunctionInfo * gi_struct_info_find_method (GIStructInfo *info, const char *name); GI_AVAILABLE_IN_ALL -gsize gi_struct_info_get_size (GIStructInfo *info); +size_t gi_struct_info_get_size (GIStructInfo *info); GI_AVAILABLE_IN_ALL -gsize gi_struct_info_get_alignment (GIStructInfo *info); +size_t gi_struct_info_get_alignment (GIStructInfo *info); GI_AVAILABLE_IN_ALL gboolean gi_struct_info_is_gtype_struct (GIStructInfo *info); diff --git a/girepository/gitypelib-internal.h b/girepository/gitypelib-internal.h index ceff41d01..26de62916 100644 --- a/girepository/gitypelib-internal.h +++ b/girepository/gitypelib-internal.h @@ -1314,7 +1314,7 @@ typedef struct { struct _GITypelib { /*< private >*/ uint8_t *data; - gsize len; + size_t len; gboolean owns_memory; GMappedFile *mfile; GList *modules; diff --git a/girepository/gitypelib.c b/girepository/gitypelib.c index 1a990c5dd..93b2c7410 100644 --- a/girepository/gitypelib.c +++ b/girepository/gitypelib.c @@ -271,7 +271,7 @@ gi_typelib_get_dir_entry_by_gtype_name (GITypelib *typelib, typedef struct { const char *s; const char *separator; - gsize sep_len; + size_t sep_len; GString buf; } StrSplitIter; @@ -294,7 +294,7 @@ strsplit_iter_next (StrSplitIter *iter, { const char *s = iter->s; const char *next; - gsize len; + size_t len; if (!s) return FALSE; @@ -347,7 +347,7 @@ gi_typelib_matches_gtype_name_prefix (GITypelib *typelib, const char *prefix; gboolean ret = FALSE; StrSplitIter split_iter; - gsize gtype_name_len; + size_t gtype_name_len; c_prefix = gi_typelib_get_string (typelib, header->c_prefix); if (c_prefix == NULL || strlen (c_prefix) == 0) @@ -558,7 +558,7 @@ validate_name (GITypelib *typelib, /* Fast path sanity check, operates on a memory blob */ static gboolean validate_header_basic (const uint8_t *memory, - gsize len, + size_t len, GError **error) { Header *header = (Header *)memory; @@ -568,8 +568,7 @@ validate_header_basic (const uint8_t *memory, g_set_error (error, GI_TYPELIB_ERROR, GI_TYPELIB_ERROR_INVALID, - "The specified typelib length %" G_GSIZE_FORMAT " is too short", - len); + "The specified typelib length %zu is too short", len); return FALSE; } @@ -608,8 +607,8 @@ validate_header_basic (const uint8_t *memory, g_set_error (error, GI_TYPELIB_ERROR, GI_TYPELIB_ERROR_INVALID_HEADER, - "Typelib size %" G_GSIZE_FORMAT " does not match %" G_GSIZE_FORMAT, - (gsize) header->size, len); + "Typelib size %zu does not match %zu", + (size_t) header->size, len); return FALSE; } @@ -2410,7 +2409,7 @@ gi_typelib_ensure_open (GITypelib *typelib) */ GITypelib * gi_typelib_new_from_memory (uint8_t *memory, - gsize len, + size_t len, GError **error) { GITypelib *meta; @@ -2440,8 +2439,8 @@ gi_typelib_new_from_memory (uint8_t *memory, */ GITypelib * gi_typelib_new_from_const_memory (const uint8_t *memory, - gsize len, - GError **error) + size_t len, + GError **error) { GITypelib *meta; @@ -2474,7 +2473,7 @@ gi_typelib_new_from_mapped_file (GMappedFile *mfile, { GITypelib *meta; uint8_t *data = (uint8_t *) g_mapped_file_get_contents (mfile); - gsize len = g_mapped_file_get_length (mfile); + size_t len = g_mapped_file_get_length (mfile); if (!validate_header_basic (data, len, error)) return NULL; diff --git a/girepository/gitypelib.h b/girepository/gitypelib.h index dc2499ddd..ec03759d5 100644 --- a/girepository/gitypelib.h +++ b/girepository/gitypelib.h @@ -38,12 +38,12 @@ typedef struct _GITypelib GITypelib; GI_AVAILABLE_IN_ALL GITypelib * gi_typelib_new_from_memory (uint8_t *memory, - gsize len, + size_t len, GError **error); GI_AVAILABLE_IN_ALL GITypelib * gi_typelib_new_from_const_memory (const uint8_t *memory, - gsize len, + size_t len, GError **error); GI_AVAILABLE_IN_ALL diff --git a/girepository/gitypes.h b/girepository/gitypes.h index 77e64fa5e..b9b4b9faa 100644 --- a/girepository/gitypes.h +++ b/girepository/gitypes.h @@ -133,7 +133,7 @@ union _GIArgument long v_long; unsigned long v_ulong; gssize v_ssize; - gsize v_size; + size_t v_size; char *v_string; void *v_pointer; }; diff --git a/girepository/giunioninfo.c b/girepository/giunioninfo.c index e3c4397a4..36b777893 100644 --- a/girepository/giunioninfo.c +++ b/girepository/giunioninfo.c @@ -260,7 +260,7 @@ gi_union_info_find_method (GIUnionInfo *info, * Returns: size of the union, in bytes * Since: 2.80 */ -gsize +size_t gi_union_info_get_size (GIUnionInfo *info) { GIRealInfo *rinfo = (GIRealInfo *)info; @@ -278,7 +278,7 @@ gi_union_info_get_size (GIUnionInfo *info) * Returns: required alignment, in bytes * Since: 2.80 */ -gsize +size_t gi_union_info_get_alignment (GIUnionInfo *info) { GIRealInfo *rinfo = (GIRealInfo *)info; diff --git a/girepository/giunioninfo.h b/girepository/giunioninfo.h index df24d0bf4..9cd5ad05e 100644 --- a/girepository/giunioninfo.h +++ b/girepository/giunioninfo.h @@ -75,10 +75,10 @@ GIFunctionInfo * gi_union_info_find_method (GIUnionInfo *info, const char *name); GI_AVAILABLE_IN_ALL -gsize gi_union_info_get_size (GIUnionInfo *info); +size_t gi_union_info_get_size (GIUnionInfo *info); GI_AVAILABLE_IN_ALL -gsize gi_union_info_get_alignment (GIUnionInfo *info); +size_t gi_union_info_get_alignment (GIUnionInfo *info); GI_AVAILABLE_IN_ALL const char * gi_union_info_get_copy_function_name (GIUnionInfo *info); diff --git a/girepository/givfuncinfo.c b/girepository/givfuncinfo.c index 1ac79be96..cb37d7e76 100644 --- a/girepository/givfuncinfo.c +++ b/girepository/givfuncinfo.c @@ -341,9 +341,9 @@ gboolean gi_vfunc_info_invoke (GIVFuncInfo *info, GType implementor, const GIArgument *in_args, - gsize n_in_args, + size_t n_in_args, GIArgument *out_args, - gsize n_out_args, + size_t n_out_args, GIArgument *return_value, GError **error) { diff --git a/girepository/givfuncinfo.h b/girepository/givfuncinfo.h index 85f23c707..776317ad4 100644 --- a/girepository/givfuncinfo.h +++ b/girepository/givfuncinfo.h @@ -64,9 +64,9 @@ GI_AVAILABLE_IN_ALL gboolean gi_vfunc_info_invoke (GIVFuncInfo *info, GType implementor, const GIArgument *in_args, - gsize n_in_args, + size_t n_in_args, GIArgument *out_args, - gsize n_out_args, + size_t n_out_args, GIArgument *return_value, GError **error);