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

girepository: ArgBlob: rename allow_none parameter

Browse Source 
Rename the "allow_none" parameter on internal/private structure ArgBlob
to "nullable".

This is a straight rename with no other changes.

https://bugzilla.gnome.org/show_bug.cgi?id=660879
This commit is contained in:
Ryan Lortie 2014-04-16 11:33:36 -04:00
parent cf4fb6a0fe
commit 6d1df44ff7
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
giarginfo.c
View File

@ -162,7 +162,7 @@ g_arg_info_may_be_null (GIArgInfo *info)
blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset]; blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset];
return blob->allow_none; return blob->nullable;
} }
/** /**

10
girnode.c
View File

@ -1660,7 +1660,7 @@ _g_ir_node_build_typelib (GIrNode *node,
_g_ir_node_build_typelib ((GIrNode *)function->result->type, _g_ir_node_build_typelib ((GIrNode *)function->result->type,
node, build, &signature, offset2); node, build, &signature, offset2);
blob2->may_return_null = function->result->allow_none; blob2->may_return_null = function->result->nullable;
blob2->caller_owns_return_value = function->result->transfer; blob2->caller_owns_return_value = function->result->transfer;
blob2->caller_owns_return_container = function->result->shallow_transfer; blob2->caller_owns_return_container = function->result->shallow_transfer;
blob2->skip_return = function->result->skip; blob2->skip_return = function->result->skip;
@ -1702,7 +1702,7 @@ _g_ir_node_build_typelib (GIrNode *node,
_g_ir_node_build_typelib ((GIrNode *)function->result->type, _g_ir_node_build_typelib ((GIrNode *)function->result->type,
node, build, &signature, offset2); node, build, &signature, offset2);
blob2->may_return_null = function->result->allow_none; blob2->may_return_null = function->result->nullable;
blob2->caller_owns_return_value = function->result->transfer; blob2->caller_owns_return_value = function->result->transfer;
blob2->caller_owns_return_container = function->result->shallow_transfer; blob2->caller_owns_return_container = function->result->shallow_transfer;
blob2->reserved = 0; blob2->reserved = 0;
@ -1759,7 +1759,7 @@ _g_ir_node_build_typelib (GIrNode *node,
_g_ir_node_build_typelib ((GIrNode *)signal->result->type, _g_ir_node_build_typelib ((GIrNode *)signal->result->type,
node, build, &signature, offset2); node, build, &signature, offset2);
blob2->may_return_null = signal->result->allow_none; blob2->may_return_null = signal->result->nullable;
blob2->caller_owns_return_value = signal->result->transfer; blob2->caller_owns_return_value = signal->result->transfer;
blob2->caller_owns_return_container = signal->result->shallow_transfer; blob2->caller_owns_return_container = signal->result->shallow_transfer;
blob2->reserved = 0; blob2->reserved = 0;
@ -1817,7 +1817,7 @@ _g_ir_node_build_typelib (GIrNode *node,
_g_ir_node_build_typelib ((GIrNode *)vfunc->result->type, _g_ir_node_build_typelib ((GIrNode *)vfunc->result->type,
node, build, &signature, offset2); node, build, &signature, offset2);
blob2->may_return_null = vfunc->result->allow_none; blob2->may_return_null = vfunc->result->nullable;
blob2->caller_owns_return_value = vfunc->result->transfer; blob2->caller_owns_return_value = vfunc->result->transfer;
blob2->caller_owns_return_container = vfunc->result->shallow_transfer; blob2->caller_owns_return_container = vfunc->result->shallow_transfer;
blob2->reserved = 0; blob2->reserved = 0;
@ -1848,7 +1848,7 @@ _g_ir_node_build_typelib (GIrNode *node,
blob->in = param->in; blob->in = param->in;
blob->out = param->out; blob->out = param->out;
blob->caller_allocates = param->caller_allocates; blob->caller_allocates = param->caller_allocates;
blob->allow_none = param->allow_none; blob->nullable = param->nullable;
blob->skip = param->skip; blob->skip = param->skip;
blob->optional = param->optional; blob->optional = param->optional;
blob->transfer_ownership = param->transfer; blob->transfer_ownership = param->transfer;

2
girnode.h
View File

@ -146,7 +146,7 @@ struct _GIrNodeParam
gboolean caller_allocates; gboolean caller_allocates;
gboolean optional; gboolean optional;
gboolean retval; gboolean retval;
gboolean allow_none; gboolean nullable;
gboolean skip; gboolean skip;
gboolean transfer; gboolean transfer;
gboolean shallow_transfer; gboolean shallow_transfer;

4
girparser.c
View File

@ -1127,9 +1127,9 @@ start_parameter (GMarkupParseContext *context,
param->optional = FALSE; param->optional = FALSE;
if (allow_none && strcmp (allow_none, "1") == 0) if (allow_none && strcmp (allow_none, "1") == 0)
param->allow_none = TRUE; param->nullable = TRUE;
else else
param->allow_none = FALSE; param->nullable = FALSE;
if (skip && strcmp (skip, "1") == 0) if (skip && strcmp (skip, "1") == 0)
param->skip = TRUE; param->skip = TRUE;

4
gitypelib-internal.h
View File

@ -396,7 +396,7 @@ typedef union _SimpleTypeBlob SimpleTypeBlob;
* parameter, the function actually takes an uint32*. * parameter, the function actually takes an uint32*.
* @caller_allocates: The parameter is a pointer to a struct or object that * @caller_allocates: The parameter is a pointer to a struct or object that
* will receive an output of the function. * will receive an output of the function.
* @allow_none: Only meaningful for types which are passed as pointers. For an * @nullable: Only meaningful for types which are passed as pointers. For an
* in parameter, indicates if it is ok to pass NULL in. Gor an out * in parameter, indicates if it is ok to pass NULL in. Gor an out
* parameter, indicates whether it may return NULL. Note that NULL is a * parameter, indicates whether it may return NULL. Note that NULL is a
* valid GList and GSList value, thus allow_none will normally be set * valid GList and GSList value, thus allow_none will normally be set
@ -437,7 +437,7 @@ typedef struct {
guint in : 1; guint in : 1;
guint out : 1; guint out : 1;
guint caller_allocates : 1; guint caller_allocates : 1;
guint allow_none : 1; guint nullable : 1;
guint optional : 1; guint optional : 1;
guint transfer_ownership : 1; guint transfer_ownership : 1;
guint transfer_container_ownership : 1; guint transfer_container_ownership : 1;