From fc4c6a6be85aa955662601f7b3462bde995c4245 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Mon, 28 Mar 2011 20:41:00 -0400 Subject: [PATCH] upkg: Print full object name when exporting. --- src/upkg.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/upkg.c b/src/upkg.c index c13a867..0e5a84e 100644 --- a/src/upkg.c +++ b/src/upkg.c @@ -309,13 +309,13 @@ static int object_info(GTypeModule *pkg, unsigned long idx) return 0; } -static int export(struct upkg *pkg, GObject *obj, unsigned idx) +static int export(GTypeModule *pkg, GObject *obj, unsigned idx) { - const struct upkg_export *export = upkg_get_export(pkg, idx); + struct upkg *upkg = U_PKG(pkg)->pkg; char name[256]; FILE *of; - if (u_object_deserialize(obj, pkg, idx) != 0) { + if (u_object_deserialize(obj, upkg, idx) != 0) { return -1; } @@ -325,7 +325,10 @@ static int export(struct upkg *pkg, GObject *obj, unsigned idx) u_object_export_name(obj, name, sizeof name); - printf("exporting %s to %s\n", export->name, name); + printf("exporting "); + export_print_fullname(pkg, upkg_get_export(upkg, idx)); + printf(" to %s\n", name); + of = fopen(name, "wb"); if (!of) { perror(name); @@ -346,15 +349,16 @@ static int export(struct upkg *pkg, GObject *obj, unsigned idx) return 0; } -int package_export(struct upkg *pkg) +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 < pkg->export_count; i++) { - class = upkg_export_class(pkg, i, &package); + 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; @@ -436,7 +440,7 @@ static int process_object(int mode, const char *objname) ret = package_list(pkg, current+1); break; case MODE_EXPORT: - ret = package_export(U_PKG(pkg)->pkg); + ret = package_export(pkg); break; default: abort(); -- 2.43.0