#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);
GObject *obj;
unsigned n;
- obj = u_object_new_from_package(upkg, idx);
+ obj = u_object_new_from_package(pkg, idx);
if (!obj) {
fprintf(stderr, "%s: failed to load object.\n",
progname);
if (G_VALUE_HOLDS(&val, U_TYPE_OBJECT)) {
UObject *obj = g_value_get_object(&val);
- /* TODO: Display full object names here. */
- if (obj->pkg_file) {
- printf(" %s", obj->pkg_file->name);
+ if (obj && obj->pkg_name) {
+ printf(" %s", obj->pkg_name);
}
}
static int object_export(GTypeModule *pkg, unsigned long idx)
{
- struct upkg *upkg = U_PKG(pkg)->pkg;
GObject *obj;
int ret = -1;
- obj = u_object_new_from_package(upkg, idx);
+ obj = u_object_new_from_package(pkg, idx);
if (!obj) {
fprintf(stderr, "%s: failed to load object.\n", progname);
return -1;
int package_export(GTypeModule *pkg)
{
struct upkg *upkg = U_PKG(pkg)->pkg;
- const char *class, *package;
GObject *obj;
- GType type;
int ret = 0;
for (unsigned i = 0; i < upkg->export_count; i++) {
- class = upkg_export_class(upkg, i, &package);
- if (!class) {
- fprintf(stderr, "error getting class information.\n");
- return -1;
- }
-
- type = u_object_module_get_class(package, class);
- if (!type)
- continue;
-
- obj = g_object_new(type, NULL);
- if (U_OBJECT_IS_EXPORTABLE(obj)) {
- if (u_object_deserialize(obj, upkg, i) != 0
- || export(pkg, obj, i) != 0) {
- ret = -1;
- }
+ obj = u_object_new_from_package(pkg, i);
+ if (U_OBJECT_IS_EXPORTABLE(obj) && export(pkg, obj, i) != 0) {
+ ret = -1;
}
g_object_unref(obj);
}
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)