#include <stdlib.h>
#include <string.h>
#include <errno.h>
+#include <assert.h>
#include <getopt.h>
#include <glib-object.h>
static void export_print_name(struct upkg *upkg, const struct upkg_export *e)
{
if (e) {
- export_print_name(upkg, upkg_get_export(upkg, e->package-1));
+ export_print_name(upkg, e->parent);
printf(".%s", e->name);
}
}
export_print_name(U_PKG(pkg)->pkg, export);
}
-static int package_list(GTypeModule *pkg, long parent)
+static int package_list(GTypeModule *pkg, long current)
{
struct upkg *upkg = U_PKG(pkg)->pkg;
- const struct upkg_export *export;
+ const struct upkg_export *parent = NULL;
+
+ if (current >= 0) {
+ parent = upkg_get_export(upkg, current);
+ assert(parent != NULL);
+ }
for (unsigned i = 0; i < upkg->export_count; i++) {
- export = upkg_get_export(upkg, i);
+ const struct upkg_export *export = upkg_get_export(upkg, i);
- if (export->package != parent)
+ if (export->parent != parent)
continue;
export_print_fullname(pkg, export);
ret = object_info(pkg, current);
break;
case MODE_LIST:
- ret = package_list(pkg, current+1);
+ ret = package_list(pkg, current);
break;
case MODE_EXPORT:
if (current < 0)