luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-03 01:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

girepository: Various indentation cleanups

Browse Source 
Various random syntax cleanups found while refactoring
This commit is contained in:
Marco Trevisan (Treviño) 2024-01-16 02:34:02 +01:00
parent b68857e707
commit a201cbd719
4 changed files with 209 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
girepository/girepository.c
View File

@ -633,10 +633,10 @@ gi_repository_get_dependencies (GIRepository *repository,
* Since: 2.80 * Since: 2.80
*/ */
const char * const char *
gi_repository_load_typelib (GIRepository *repository, gi_repository_load_typelib (GIRepository *repository,
GITypelib *typelib, GITypelib *typelib,
GIRepositoryLoadFlags flags, GIRepositoryLoadFlags flags,
GError **error) GError **error)
{ {
Header *header; Header *header;
const char *namespace; const char *namespace;
@ -1851,12 +1851,12 @@ gi_repository_require (GIRepository *repository,
* Since: 2.80 * Since: 2.80
*/ */
GITypelib * GITypelib *
gi_repository_require_private (GIRepository *repository, gi_repository_require_private (GIRepository *repository,
const char *typelib_dir, const char *typelib_dir,
const char *namespace, const char *namespace,
const char *version, const char *version,
GIRepositoryLoadFlags flags, GIRepositoryLoadFlags flags,
GError **error) GError **error)
{ {
const char * const search_path[] = { typelib_dir, NULL }; const char * const search_path[] = { typelib_dir, NULL };

394
girepository/girparser.c
View File

@ -132,21 +132,21 @@ struct _ParseContext
}; };
#define CURRENT_NODE(ctx) ((GIIrNode *)((ctx)->node_stack->data)) #define CURRENT_NODE(ctx) ((GIIrNode *)((ctx)->node_stack->data))
static void start_element_handler (GMarkupParseContext *context, static void start_element_handler (GMarkupParseContext *context,
const char *element_name, const char *element_name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
void *user_data, void *user_data,
GError **error); GError **error);
static void end_element_handler (GMarkupParseContext *context, static void end_element_handler (GMarkupParseContext *context,
const char *element_name, const char *element_name,
void *user_data, void *user_data,
GError **error); GError **error);
static void text_handler (GMarkupParseContext *context, static void text_handler (GMarkupParseContext *context,
const char *text, const char *text,
gsize text_len, gsize text_len,
void *user_data, void *user_data,
GError **error); GError **error);
static void cleanup (GMarkupParseContext *context, static void cleanup (GMarkupParseContext *context,
GError *error, GError *error,
void *user_data); void *user_data);
@ -163,21 +163,21 @@ static GMarkupParser markup_parser =
}; };
static gboolean static gboolean
start_alias (GMarkupParseContext *context, start_alias (GMarkupParseContext *context,
const char *element_name, const char *element_name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
ParseContext *ctx, ParseContext *ctx,
GError **error); GError **error);
static gboolean static gboolean
start_type (GMarkupParseContext *context, start_type (GMarkupParseContext *context,
const char *element_name, const char *element_name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
ParseContext *ctx, ParseContext *ctx,
GError **error); GError **error);
static const char *find_attribute (const char *name, static const char *find_attribute (const char *name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values); const char **attribute_values);
@ -218,12 +218,12 @@ gi_ir_parser_set_includes (GIIrParser *parser,
} }
static void static void
firstpass_start_element_handler (GMarkupParseContext *context, firstpass_start_element_handler (GMarkupParseContext *context,
const char *element_name, const char *element_name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
void *user_data, void *user_data,
GError **error) GError **error)
{ {
ParseContext *ctx = user_data; ParseContext *ctx = user_data;
@ -265,10 +265,10 @@ firstpass_start_element_handler (GMarkupParseContext *context,
} }
static void static void
firstpass_end_element_handler (GMarkupParseContext *context, firstpass_end_element_handler (GMarkupParseContext *context,
const char *element_name, const char *element_name,
void *user_data, gpointer user_data,
GError **error) GError **error)
{ {
ParseContext *ctx = user_data; ParseContext *ctx = user_data;
if (strcmp (element_name, "alias") == 0) if (strcmp (element_name, "alias") == 0)
@ -770,11 +770,11 @@ parse_type (ParseContext *ctx, const char *type)
} }
static gboolean static gboolean
introspectable_prelude (GMarkupParseContext *context, introspectable_prelude (GMarkupParseContext *context,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
ParseContext *ctx, ParseContext *ctx,
ParseState new_state) ParseState new_state)
{ {
const char *introspectable_arg; const char *introspectable_arg;
const char *shadowed_by; const char *shadowed_by;
@ -796,12 +796,12 @@ introspectable_prelude (GMarkupParseContext *context,
} }
static gboolean static gboolean
start_glib_boxed (GMarkupParseContext *context, start_glib_boxed (GMarkupParseContext *context,
const char *element_name, const char *element_name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
ParseContext *ctx, ParseContext *ctx,
GError **error) GError **error)
{ {
const char *name; const char *name;
const char *typename; const char *typename;
@ -856,12 +856,12 @@ start_glib_boxed (GMarkupParseContext *context,
} }
static gboolean static gboolean
start_function (GMarkupParseContext *context, start_function (GMarkupParseContext *context,
const char *element_name, const char *element_name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
ParseContext *ctx, ParseContext *ctx,
GError **error) GError **error)
{ {
const char *name; const char *name;
const char *shadows; const char *shadows;
@ -1133,12 +1133,12 @@ parse_param_transfer (GIIrNodeParam *param, const char *transfer, const char *na
} }
static gboolean static gboolean
start_instance_parameter (GMarkupParseContext *context, start_instance_parameter (GMarkupParseContext *context,
const char *element_name, const char *element_name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
ParseContext *ctx, ParseContext *ctx,
GError **error) GError **error)
{ {
const char *transfer; const char *transfer;
gboolean transfer_full; gboolean transfer_full;
@ -1198,12 +1198,12 @@ start_instance_parameter (GMarkupParseContext *context,
} }
static gboolean static gboolean
start_parameter (GMarkupParseContext *context, start_parameter (GMarkupParseContext *context,
const char *element_name, const char *element_name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
ParseContext *ctx, ParseContext *ctx,
GError **error) GError **error)
{ {
const char *name; const char *name;
const char *direction; const char *direction;
@ -1351,12 +1351,12 @@ start_parameter (GMarkupParseContext *context,
} }
static gboolean static gboolean
start_field (GMarkupParseContext *context, start_field (GMarkupParseContext *context,
const char *element_name, const char *element_name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
ParseContext *ctx, ParseContext *ctx,
GError **error) GError **error)
{ {
const char *name; const char *name;
const char *readable; const char *readable;
@ -1496,12 +1496,12 @@ start_field (GMarkupParseContext *context,
} }
static gboolean static gboolean
start_alias (GMarkupParseContext *context, start_alias (GMarkupParseContext *context,
const char *element_name, const char *element_name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
ParseContext *ctx, ParseContext *ctx,
GError **error) GError **error)
{ {
const char *name; const char *name;
@ -1519,12 +1519,12 @@ start_alias (GMarkupParseContext *context,
} }
static gboolean static gboolean
start_enum (GMarkupParseContext *context, start_enum (GMarkupParseContext *context,
const char *element_name, const char *element_name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
ParseContext *ctx, ParseContext *ctx,
GError **error) GError **error)
{ {
const char *name; const char *name;
const char *typename; const char *typename;
@ -1576,12 +1576,12 @@ start_enum (GMarkupParseContext *context,
} }
static gboolean static gboolean
start_property (GMarkupParseContext *context, start_property (GMarkupParseContext *context,
const char *element_name, const char *element_name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
ParseContext *ctx, ParseContext *ctx,
GError **error) GError **error)
{ {
ParseState target_state; ParseState target_state;
const char *name; const char *name;
@ -1685,12 +1685,12 @@ parse_value (const char *str)
} }
static gboolean static gboolean
start_member (GMarkupParseContext *context, start_member (GMarkupParseContext *context,
const char *element_name, const char *element_name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
ParseContext *ctx, ParseContext *ctx,
GError **error) GError **error)
{ {
const char *name; const char *name;
const char *value; const char *value;
@ -1737,12 +1737,12 @@ start_member (GMarkupParseContext *context,
} }
static gboolean static gboolean
start_constant (GMarkupParseContext *context, start_constant (GMarkupParseContext *context,
const char *element_name, const char *element_name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
ParseContext *ctx, ParseContext *ctx,
GError **error) GError **error)
{ {
ParseState prev_state; ParseState prev_state;
ParseState target_state; ParseState target_state;
@ -1823,12 +1823,12 @@ start_constant (GMarkupParseContext *context,
} }
static gboolean static gboolean
start_interface (GMarkupParseContext *context, start_interface (GMarkupParseContext *context,
const char *element_name, const char *element_name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
ParseContext *ctx, ParseContext *ctx,
GError **error) GError **error)
{ {
const char *name; const char *name;
const char *typename; const char *typename;
@ -1885,12 +1885,12 @@ start_interface (GMarkupParseContext *context,
} }
static gboolean static gboolean
start_class (GMarkupParseContext *context, start_class (GMarkupParseContext *context,
const char *element_name, const char *element_name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
ParseContext *ctx, ParseContext *ctx,
GError **error) GError **error)
{ {
const char *name; const char *name;
const char *parent; const char *parent;
@ -1978,12 +1978,12 @@ start_class (GMarkupParseContext *context,
} }
static gboolean static gboolean
start_type (GMarkupParseContext *context, start_type (GMarkupParseContext *context,
const char *element_name, const char *element_name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
ParseContext *ctx, ParseContext *ctx,
GError **error) GError **error)
{ {
const char *name; const char *name;
const char *ctype; const char *ctype;
@ -2300,12 +2300,12 @@ end_type (ParseContext *ctx)
} }
static gboolean static gboolean
start_attribute (GMarkupParseContext *context, start_attribute (GMarkupParseContext *context,
const char *element_name, const char *element_name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
ParseContext *ctx, ParseContext *ctx,
GError **error) GError **error)
{ {
const char *name; const char *name;
const char *value; const char *value;
@ -2345,12 +2345,12 @@ start_attribute (GMarkupParseContext *context,
} }
static gboolean static gboolean
start_return_value (GMarkupParseContext *context, start_return_value (GMarkupParseContext *context,
const char *element_name, const char *element_name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
ParseContext *ctx, ParseContext *ctx,
GError **error) GError **error)
{ {
GIIrNodeParam *param; GIIrNodeParam *param;
const char *transfer; const char *transfer;
@ -2414,12 +2414,12 @@ start_return_value (GMarkupParseContext *context,
} }
static gboolean static gboolean
start_implements (GMarkupParseContext *context, start_implements (GMarkupParseContext *context,
const char *element_name, const char *element_name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
ParseContext *ctx, ParseContext *ctx,
GError **error) GError **error)
{ {
GIIrNodeInterface *iface; GIIrNodeInterface *iface;
const char *name; const char *name;
@ -2444,12 +2444,12 @@ start_implements (GMarkupParseContext *context,
} }
static gboolean static gboolean
start_glib_signal (GMarkupParseContext *context, start_glib_signal (GMarkupParseContext *context,
const char *element_name, const char *element_name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
ParseContext *ctx, ParseContext *ctx,
GError **error) GError **error)
{ {
const char *name; const char *name;
const char *when; const char *when;
@ -2527,12 +2527,12 @@ start_glib_signal (GMarkupParseContext *context,
} }
static gboolean static gboolean
start_vfunc (GMarkupParseContext *context, start_vfunc (GMarkupParseContext *context,
const char *element_name, const char *element_name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
ParseContext *ctx, ParseContext *ctx,
GError **error) GError **error)
{ {
const char *name; const char *name;
const char *must_chain_up; const char *must_chain_up;
@ -2618,12 +2618,12 @@ start_vfunc (GMarkupParseContext *context,
} }
static gboolean static gboolean
start_struct (GMarkupParseContext *context, start_struct (GMarkupParseContext *context,
const char *element_name, const char *element_name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
ParseContext *ctx, ParseContext *ctx,
GError **error) GError **error)
{ {
const char *name; const char *name;
const char *deprecated; const char *deprecated;
@ -2712,12 +2712,12 @@ start_struct (GMarkupParseContext *context,
} }
static gboolean static gboolean
start_union (GMarkupParseContext *context, start_union (GMarkupParseContext *context,
const char *element_name, const char *element_name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
ParseContext *ctx, ParseContext *ctx,
GError **error) GError **error)
{ {
const char *name; const char *name;
const char *deprecated; const char *deprecated;
@ -2771,12 +2771,12 @@ start_union (GMarkupParseContext *context,
} }
static gboolean static gboolean
start_discriminator (GMarkupParseContext *context, start_discriminator (GMarkupParseContext *context,
const char *element_name, const char *element_name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
ParseContext *ctx, ParseContext *ctx,
GError **error) GError **error)
{ {
const char *type; const char *type;
const char *offset; const char *offset;
@ -2883,12 +2883,12 @@ parse_include (GMarkupParseContext *context,
extern GLogLevelFlags logged_levels; extern GLogLevelFlags logged_levels;
static void static void
start_element_handler (GMarkupParseContext *context, start_element_handler (GMarkupParseContext *context,
const char *element_name, const char *element_name,
const char **attribute_names, const char **attribute_names,
const char **attribute_values, const char **attribute_values,
void *user_data, gpointer user_data,
GError **error) GError **error)
{ {
ParseContext *ctx = user_data; ParseContext *ctx = user_data;
@ -3263,10 +3263,10 @@ start_element_handler (GMarkupParseContext *context,
} }
static gboolean static gboolean
require_one_of_end_elements (GMarkupParseContext *context, require_one_of_end_elements (GMarkupParseContext *context,
ParseContext *ctx, ParseContext *ctx,
const char *actual_name, const char *actual_name,
GError **error, GError **error,
...) ...)
{ {
va_list args; va_list args;
@ -3301,10 +3301,10 @@ require_one_of_end_elements (GMarkupParseContext *context,
} }
static gboolean static gboolean
state_switch_end_struct_or_union (GMarkupParseContext *context, state_switch_end_struct_or_union (GMarkupParseContext *context,
ParseContext *ctx, ParseContext *ctx,
const char *element_name, const char *element_name,
GError **error) GError **error)
{ {
pop_node (ctx); pop_node (ctx);
if (ctx->node_stack == NULL) if (ctx->node_stack == NULL)
@ -3336,20 +3336,20 @@ state_switch_end_struct_or_union (GMarkupParseContext *context,
} }
static gboolean static gboolean
require_end_element (GMarkupParseContext *context, require_end_element (GMarkupParseContext *context,
ParseContext *ctx, ParseContext *ctx,
const char *expected_name, const char *expected_name,
const char *actual_name, const char *actual_name,
GError **error) GError **error)
{ {
return require_one_of_end_elements (context, ctx, actual_name, error, expected_name, NULL); return require_one_of_end_elements (context, ctx, actual_name, error, expected_name, NULL);
} }
static void static void
end_element_handler (GMarkupParseContext *context, end_element_handler (GMarkupParseContext *context,
const char *element_name, const char *element_name,
void *user_data, gpointer user_data,
GError **error) GError **error)
{ {
ParseContext *ctx = user_data; ParseContext *ctx = user_data;
@ -3647,11 +3647,11 @@ end_element_handler (GMarkupParseContext *context,
} }
static void static void
text_handler (GMarkupParseContext *context, text_handler (GMarkupParseContext *context,
const char *text, const char *text,
gsize text_len, gsize text_len,
void *user_data, gpointer user_data,
GError **error) GError **error)
{ {
/* FIXME warn about non-whitespace text */ /* FIXME warn about non-whitespace text */
} }

2
girepository/givfuncinfo.c
View File

@ -61,7 +61,7 @@ gi_base_info_find_vfunc (GIRealInfo *rinfo,
if (strcmp (name, fname) == 0) if (strcmp (name, fname) == 0)
return (GIVFuncInfo *) gi_info_new (GI_INFO_TYPE_VFUNC, (GIBaseInfo*) rinfo, return (GIVFuncInfo *) gi_info_new (GI_INFO_TYPE_VFUNC, (GIBaseInfo*) rinfo,
rinfo->typelib, offset); rinfo->typelib, offset);
offset += header->vfunc_blob_size; offset += header->vfunc_blob_size;
} }