p/logdiag
1
1
Fork 0
Code Issues Pull Requests Releases 4 Wiki Activity

Check for name collisions in symbol categories.

Browse Source
This commit is contained in:
Přemysl Eric Janouch 2010-12-11 03:41:45 +01:00
parent e6230576b7
commit fe7c270bdd
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/ld-library.c
View File

@ -249,9 +249,30 @@ load_category_cb (const gchar *base, const gchar *filename, gpointer userdata)
static void static void
load_category_symbol_cb (LdSymbol *symbol, gpointer user_data) load_category_symbol_cb (LdSymbol *symbol, gpointer user_data)
{ {
/* TODO: Don't just add blindly, also check for name collisions. */ const gchar *name;
ld_symbol_category_insert_child LdSymbolCategory *cat;
(LD_SYMBOL_CATEGORY (user_data), G_OBJECT (symbol), -1); const GSList *children, *iter;
g_return_if_fail (LD_IS_SYMBOL (symbol));
g_return_if_fail (LD_IS_SYMBOL_CATEGORY (user_data));
cat = LD_SYMBOL_CATEGORY (user_data);
name = ld_symbol_get_name (symbol);
/* Check for name collisions with other symbols. */
children = ld_symbol_category_get_children (cat);
for (iter = children; iter; iter = iter->next)
{
if (!LD_IS_SYMBOL (iter->data))
continue;
if (!strcmp (name, ld_symbol_get_name (LD_SYMBOL (iter->data))))
{
g_warning ("Attempted to insert multiple '%s' symbols into"
" category '%s'.", name, ld_symbol_category_get_name (cat));
return;
}
}
ld_symbol_category_insert_child (cat, G_OBJECT (symbol), -1);
} }
/* /*