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

schema compiler: Don't store zero-valued flags

Browse Source 
Don't store the "none" value for flags into the compiled schema file.
"none" should never appear as a value -- no flags set is indicated by an
empty array.
This commit is contained in:
Ryan Lortie
2010-10-04 02:57:06 -04:00
parent 136e705e83
commit 833e389516
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gio/glib-compile-schemas.c
View File

@@ -107,6 +107,12 @@ enum_state_add_value (EnumState *state,
return; return;
} }
/* Silently drop the null case if it is mentioned.
* It is properly denoted with an empty array.
*/
if (state->is_flags && value == 0)
return;
if (state->is_flags && (value & (value - 1))) if (state->is_flags && (value & (value - 1)))
{ {
g_set_error (error, G_MARKUP_ERROR, g_set_error (error, G_MARKUP_ERROR,
@@ -121,7 +127,6 @@ enum_state_add_value (EnumState *state,
* If we loosen the one-bit-set restriction we need an overlap check. * If we loosen the one-bit-set restriction we need an overlap check.
*/ */
strinfo_builder_append_item (state->strinfo, nick, value); strinfo_builder_append_item (state->strinfo, nick, value);
} }