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

glib-compile-schemas: check for undefined refs

Browse Source 
For child schemas, verify that the named schema actually exists and
issue a warning if not.  This error in schema files will cause runtime
errors when iterating over the list of child schemas and attempting to
instantiate each one.

This will move from being merely a warning to a hard error in the
future.

Bug #646039.
This commit is contained in:
Ryan Lortie 2011-04-08 01:47:52 -04:00
parent 4ece333afe
commit 3498d58289
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1532,6 +1532,13 @@ gvdb_pair_init (GvdbPair *pair)
typedef struct
{
GHashTable *schema_table;
GvdbPair root_pair;
} WriteToFileData;
typedef struct
{
GHashTable *schema_table;
GvdbPair pair;
gboolean l10n;
} OutputSchemaData;
@ -1556,6 +1563,11 @@ output_key (gpointer key,
if (state->l10n)
data->l10n = TRUE;
if (state->child_schema &&
!g_hash_table_lookup (data->schema_table, state->child_schema))
g_printerr ("warning: undefined reference to <schema id='%s'/>\n",
state->child_schema);
}
static void
@ -1563,6 +1575,7 @@ output_schema (gpointer key,
gpointer value,
gpointer user_data)
{
WriteToFileData *wtf_data = user_data;
OutputSchemaData data;
GvdbPair *root_pair;
SchemaState *state;
@ -1571,8 +1584,9 @@ output_schema (gpointer key,
id = key;
state = value;
root_pair = user_data;
root_pair = &wtf_data->root_pair;
data.schema_table = wtf_data->schema_table;
gvdb_pair_init (&data.pair);
data.l10n = FALSE;
@ -1604,17 +1618,19 @@ write_to_file (GHashTable *schema_table,
const gchar *filename,
GError **error)
{
WriteToFileData data;
gboolean success;
GvdbPair pair;
gvdb_pair_init (&pair);
data.schema_table = schema_table;
g_hash_table_foreach (schema_table, output_schema, &pair);
gvdb_pair_init (&data.root_pair);
success = gvdb_table_write_contents (pair.table, filename,
g_hash_table_foreach (schema_table, output_schema, &data);
success = gvdb_table_write_contents (data.root_pair.table, filename,
G_BYTE_ORDER != G_LITTLE_ENDIAN,
error);
g_hash_table_unref (pair.table);
g_hash_table_unref (data.root_pair.table);
return success;
}