uobject: Remove the file parameter from deserialize.

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

diff --git a/src/uobject/uobject.c b/src/uobject/uobject.c
index e5b500b2cd82e695cbadd2b013069a14ba22ff59..4bc165568f476db0531ed1a249764ecd3d067dcc 100644 (file)
--- a/src/uobject/uobject.c
+++ b/src/uobject/uobject.c
@@ -141,9 +141,10 @@ decode_property(UObject *o, const char *name, struct upkg_file *f, unsigned long
 }
 
 /* Deserialize properties from an Unreal package. */
-static int deserialize(UObject *o, struct upkg_file *f)
+static int deserialize(UObject *uo)
 {
-       struct u_object_priv *priv = U_OBJECT_GET_PRIV(o);
+       struct u_object_priv *priv = U_OBJECT_GET_PRIV(uo);
+       struct upkg_file *f = uo->pkg_file;
        unsigned long rc, tot_len = 0;
 
        while (1) {
@@ -175,7 +176,7 @@ static int deserialize(UObject *o, struct upkg_file *f)
                        break;
                }
 
-               rc = decode_property(U_OBJECT(o), name, f, len);
+               rc = decode_property(uo, name, f, len);
                if (rc == 0)
                        return -1;
                len = rc;
@@ -203,12 +204,13 @@ int u_object_deserialize(GObject *obj, struct upkg *pkg, unsigned long idx)
                return -1;
        }
 
-       rc = U_OBJECT_GET_CLASS(obj)->deserialize(uo, f);
+       uo->pkg      = pkg;
+       uo->pkg_file = f;
+
+       rc = U_OBJECT_GET_CLASS(obj)->deserialize(uo);
        if (rc != 0) {
                upkg_export_close(f);
-       } else {
-               uo->pkg      = pkg;
-               uo->pkg_file = f;
+               uo->pkg_file = NULL;
        }
 
        return rc;