luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-27 16:06:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug 557405 – Use 'allow-none' consistently

Browse Source 
2008-10-22  Tommi Komulainen  <tommi.komulainen@iki.fi>

	* docs/typelib-format.txt:
	* girepository/ginfo.c (g_arg_info_may_be_null):
	* girepository/girnode.c (g_ir_node_build_typelib):
	* girepository/girnode.h (struct _GIrNodeParam):
	* girepository/girparser.c (start_parameter):
	* girepository/girwriter.c (function_generate):
	* girepository/gtypelib.h (ArgBlob):
	* tests/errors.gir:
	* tests/function.gir:
	* tools/generate.c (write_callable_info): Use 'allow-none'
	consistently throughout

svn path=/trunk/; revision=782
This commit is contained in:
Tommi Komulainen 2008-10-22 14:02:02 +00:00 committed by Tommi Komulainen
parent adc6a3e2ef
commit 04c5badd69
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ginfo.c
View File

@ -707,7 +707,7 @@ g_arg_info_may_be_null (GIArgInfo *info)
GIBaseInfo *base = (GIBaseInfo *)info; GIBaseInfo *base = (GIBaseInfo *)info;
ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset]; ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset];
return blob->null_ok; return blob->allow_none;
} }
GITransfer GITransfer

10
girnode.c
View File

@ -1489,7 +1489,7 @@ g_ir_node_build_typelib (GIrNode *node,
module, modules, strings, types, module, modules, strings, types,
data, &signature, offset2); data, &signature, offset2);
blob2->may_return_null = function->result->null_ok; blob2->may_return_null = function->result->allow_none;
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;
@ -1533,7 +1533,7 @@ g_ir_node_build_typelib (GIrNode *node,
module, modules, strings, types, module, modules, strings, types,
data, &signature, offset2); data, &signature, offset2);
blob2->may_return_null = function->result->null_ok; blob2->may_return_null = function->result->allow_none;
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;
@ -1585,7 +1585,7 @@ g_ir_node_build_typelib (GIrNode *node,
module, modules, strings, types, module, modules, strings, types,
data, &signature, offset2); data, &signature, offset2);
blob2->may_return_null = signal->result->null_ok; blob2->may_return_null = signal->result->allow_none;
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;
@ -1632,7 +1632,7 @@ g_ir_node_build_typelib (GIrNode *node,
module, modules, strings, types, module, modules, strings, types,
data, &signature, offset2); data, &signature, offset2);
blob2->may_return_null = vfunc->result->null_ok; blob2->may_return_null = vfunc->result->allow_none;
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;
@ -1661,7 +1661,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->dipper = param->dipper; blob->dipper = param->dipper;
blob->null_ok = param->null_ok; blob->allow_none = param->allow_none;
blob->optional = param->optional; blob->optional = param->optional;
blob->transfer_ownership = param->transfer; blob->transfer_ownership = param->transfer;
blob->transfer_container_ownership = param->shallow_transfer; blob->transfer_container_ownership = param->shallow_transfer;

2
girnode.h
View File

@ -136,7 +136,7 @@ struct _GIrNodeParam
gboolean dipper; gboolean dipper;
gboolean optional; gboolean optional;
gboolean retval; gboolean retval;
gboolean null_ok; gboolean allow_none;
gboolean transfer; gboolean transfer;
gboolean shallow_transfer; gboolean shallow_transfer;

10
girparser.c
View File

@ -699,7 +699,7 @@ start_parameter (GMarkupParseContext *context,
const gchar *retval; const gchar *retval;
const gchar *dipper; const gchar *dipper;
const gchar *optional; const gchar *optional;
const gchar *nullok; const gchar *allow_none;
const gchar *transfer; const gchar *transfer;
GIrNodeParam *param; GIrNodeParam *param;
@ -712,7 +712,7 @@ start_parameter (GMarkupParseContext *context,
retval = find_attribute ("retval", attribute_names, attribute_values); retval = find_attribute ("retval", attribute_names, attribute_values);
dipper = find_attribute ("dipper", attribute_names, attribute_values); dipper = find_attribute ("dipper", attribute_names, attribute_values);
optional = find_attribute ("optional", attribute_names, attribute_values); optional = find_attribute ("optional", attribute_names, attribute_values);
nullok = find_attribute ("null-ok", attribute_names, attribute_values); allow_none = find_attribute ("allow-none", attribute_names, attribute_values);
transfer = find_attribute ("transfer-ownership", attribute_names, attribute_values); transfer = find_attribute ("transfer-ownership", attribute_names, attribute_values);
if (name == NULL) if (name == NULL)
@ -756,10 +756,10 @@ start_parameter (GMarkupParseContext *context,
else else
param->optional = FALSE; param->optional = FALSE;
if (nullok && strcmp (nullok, "1") == 0) if (allow_none && strcmp (allow_none, "1") == 0)
param->null_ok = TRUE; param->allow_none = TRUE;
else else
param->null_ok = FALSE; param->allow_none = FALSE;
parse_param_transfer (param, transfer); parse_param_transfer (param, transfer);

4
girwriter.c
View File

@ -183,9 +183,9 @@ function_generate (GIdlWriter * writer, GIdlNodeFunction * node)
g_string_append (markup_s, g_string_append (markup_s,
g_markup_printf_escaped (" transfer=\"full\"")); g_markup_printf_escaped (" transfer=\"full\""));
if (param->null_ok) if (param->allow_none)
g_string_append (markup_s, g_string_append (markup_s,
g_markup_printf_escaped (" null-ok=\"1\"")); g_markup_printf_escaped (" allow-none=\"1\""));
if (strcmp (direction, "in") != 0) if (strcmp (direction, "in") != 0)
g_string_append (markup_s, g_string_append (markup_s,

2
gtypelib.h
View File

@ -127,7 +127,7 @@ typedef struct
guint in : 1; guint in : 1;
guint out : 1; guint out : 1;
guint dipper : 1; guint dipper : 1;
guint null_ok : 1; guint allow_none : 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;