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

Make ld_library_find_symbol() easier to read 

As well as shorter, strangely.

Symbols may technically exist directly in the root category now.
This commit is contained in:
Přemysl Eric Janouch 2021-10-29 01:28:52 +02:00
parent ee7be81434
commit 9dcef6a14f
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 33 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
liblogdiag/ld-library.c
View File

@ -49,6 +49,8 @@ static gboolean foreach_dir (const gchar *path,
gboolean (*callback) (const gchar *, const gchar *, gpointer), gboolean (*callback) (const gchar *, const gchar *, gpointer),
gpointer userdata, GError **error); gpointer userdata, GError **error);
static LdSymbol *traverse_path (LdCategory *category, gchar **path);
G_DEFINE_TYPE (LdLibrary, ld_library, G_TYPE_OBJECT) G_DEFINE_TYPE (LdLibrary, ld_library, G_TYPE_OBJECT)
@ -356,62 +358,51 @@ ld_library_load (LdLibrary *self, const gchar *directory)
LdSymbol * LdSymbol *
ld_library_find_symbol (LdLibrary *self, const gchar *identifier) ld_library_find_symbol (LdLibrary *self, const gchar *identifier)
{ {
gchar **id_el_start, **id_el; gchar **path;
const GSList *list, *list_el; LdSymbol *symbol = NULL;
LdCategory *cat;
g_return_val_if_fail (LD_IS_LIBRARY (self), NULL); g_return_val_if_fail (LD_IS_LIBRARY (self), NULL);
g_return_val_if_fail (identifier != NULL, NULL); g_return_val_if_fail (identifier != NULL, NULL);
id_el_start = g_strsplit (identifier, LD_LIBRARY_IDENTIFIER_SEPARATOR, 0); path = g_strsplit (identifier, LD_LIBRARY_IDENTIFIER_SEPARATOR, 0);
if (!id_el_start) if (path)
return NULL;
/* We need at least one category name plus the symbol name. */
id_el = id_el_start;
if (!id_el[0] || !id_el[1])
goto ld_library_find_symbol_error;
/* Find the category where the symbol is in. */
cat = self->priv->root;
while (1)
{ {
gboolean found = FALSE; symbol = traverse_path (self->priv->root, path);
g_strfreev (path);
}
return symbol;
}
list = ld_category_get_children (cat); static LdSymbol *
for (list_el = list; list_el; list_el = g_slist_next (list_el)) traverse_path (LdCategory *category, gchar **path)
{
const GSList *list, *iter;
LdSymbol *symbol;
g_return_val_if_fail (*path != NULL, NULL);
/* Walk the category tree to where the symbol is supposed to be. */
for (; path[1]; path++)
{
list = ld_category_get_children (category);
for (iter = list; iter; iter = g_slist_next (iter))
{ {
cat = LD_CATEGORY (list_el->data); category = LD_CATEGORY (iter->data);
if (!strcmp (*id_el, ld_category_get_name (cat))) if (!strcmp (*path, ld_category_get_name (category)))
{
found = TRUE;
break; break;
}
} }
if (!iter)
if (!found) return NULL;
goto ld_library_find_symbol_error;
if (!(id_el++)[2])
break;
} }
/* And then the actual symbol. */ /* And look up the actual symbol at the leaf. */
list = ld_category_get_symbols (cat); list = ld_category_get_symbols (category);
for (list_el = list; list_el; list_el = g_slist_next (list_el)) for (iter = list; iter; iter = g_slist_next (iter))
{ {
LdSymbol *symbol; symbol = LD_SYMBOL (iter->data);
if (!strcmp (*path, ld_symbol_get_name (symbol)))
symbol = LD_SYMBOL (list_el->data);
if (!strcmp (*id_el, ld_symbol_get_name (symbol)))
{
g_strfreev (id_el_start);
return symbol; return symbol;
}
} }
ld_library_find_symbol_error:
g_strfreev (id_el_start);
return NULL; return NULL;
} }