uobject: Include package names in package fullname.

[upkg.git] / src / uobject / uobject.c

diff --git a/src/uobject/uobject.c b/src/uobject/uobject.c
index 47782922c5876ee84f93b1783c62ecaf0c02a9ce..b8c24796dafd601c7669482c0d78338f6ffd317f 100644 (file)
--- a/src/uobject/uobject.c
+++ b/src/uobject/uobject.c
@@ -27,6 +27,7 @@
 
 #include <uobject/uobject.h>
 #include <uobject/module.h>
+#include <uobject/package.h>
 #include "upkg.h"
 #include "pack.h"
 
@@ -217,7 +218,7 @@ static unsigned long deserialize_property(UObject *uo, struct prop_head *head)
        unsigned long rc, len = 0;
        GValue val = {0};
 
-       rc = decode_prop_header(uo->pkg, head, priv->buf, priv->nbuf);
+       rc = decode_prop_header(uo->pkg_file->pkg, head, priv->buf, priv->nbuf);
        if (rc == 0)
                return 0;
        len += rc;
@@ -313,17 +314,17 @@ static int deserialize(UObject *uo)
 
 /*
  * Get the full hierarchical object name for an export, used for diagnostics.
- * Currently, this does not include the package name (which is actually
- * required for this to be a "full" name) as it's not yet passed to the
- * deserialize method.
+ * The package name is passed in pname.
  *
  * Returns a buffer allocated by malloc on success, or NULL on failure.
  */
-static char *get_obj_fullname(const struct upkg_export *e)
+static char *get_obj_fullname(const char *pname, const struct upkg_export *e)
 {
-       size_t total_len = 0, len;
+       size_t total_len = strlen(pname) + 1, len;
        char *fullname;
 
+       assert(e != NULL);
+
        for (const struct upkg_export *c = e; c; c = c->parent) {
                len = strlen(c->name) + 1;
                if (total_len > SIZE_MAX - len)
@@ -344,30 +345,37 @@ static char *get_obj_fullname(const struct upkg_export *e)
                fullname[total_len + len] = c == e ? '\0' : '.';
        }
 
+       assert(total_len == strlen(pname)+1);
+       memcpy(fullname, pname, total_len-1);
+       fullname[total_len-1] = '.';
+
        return fullname;
 }
 
-int u_object_deserialize(GObject *obj, struct upkg *pkg, unsigned long idx)
+int u_object_deserialize(GObject *obj, GTypeModule *pkg, unsigned long idx)
 {
        g_return_val_if_fail(IS_U_OBJECT(obj), -1);
+       g_return_val_if_fail(IS_U_PKG(pkg), -1);
+
        UObject *uo = U_OBJECT(obj);
+       struct upkg *upkg = U_PKG(pkg)->pkg;
        const struct upkg_export *e;
        struct upkg_file *f;
        int rc;
 
        g_return_val_if_fail(uo->pkg_file == NULL, -1);
-       f = upkg_export_open(pkg, idx);
+       f = upkg_export_open(upkg, idx);
        if (!f) {
                return -1;
        }
 
-       uo->pkg      = pkg;
+       uo->pkg = pkg;
        uo->pkg_file = f;
 
-       e = upkg_get_export(pkg, idx);
+       e = upkg_get_export(upkg, idx);
        if (!e)
                return -1;
-       uo->pkg_name = get_obj_fullname(e);
+       uo->pkg_name = get_obj_fullname(pkg->name, e);
        if (!uo->pkg_name)
                return -1;
 
@@ -380,19 +388,21 @@ int u_object_deserialize(GObject *obj, struct upkg *pkg, unsigned long idx)
        return rc;
 }
 
-GObject *u_object_new_from_package(struct upkg *upkg, unsigned long idx)
+GObject *u_object_new_from_package(GTypeModule *pkg, unsigned long idx)
 {
+       g_return_val_if_fail(IS_U_PKG(pkg), NULL);
+
        const struct upkg_export *export;
        const char *class, *package;
        GObject *obj = NULL;
        GType type;
 
-       class = upkg_export_class(upkg, idx, &package);
+       class = upkg_export_class(U_PKG(pkg)->pkg, idx, &package);
 
        type = u_object_module_get_class(package, class);
        if (type) {
                obj = g_object_new(type, NULL);
-               if (u_object_deserialize(obj, upkg, idx) != 0) {
+               if (u_object_deserialize(obj, pkg, idx) != 0) {
                        g_object_unref(obj);
                        return NULL;
                }