Reorganize object hierarchy to root at "UObject".

[upkg.git] / src / upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index c40d6d14c3f69eefb51e7508d527f850a7dee003..8c26d27152ea489cf905d2011712ca206456706c 100644 (file)
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -23,7 +23,7 @@
 
 #include "upkg.h"
 #include "module.h"
-#include "serializable.h"
+#include "uobject.h"
 #include "exportable.h"
 
 void print_upkg_flags(const char *prefix, unsigned long flags)
@@ -91,13 +91,13 @@ int main(int argc, char **argv)
        if (!music)
                return EXIT_FAILURE;
        struct upkg_file *f = upkg_export_open(pkg, 0);
-       upkg_deserialize(music, f);
+       u_object_deserialize(music, f);
 
        char name[256];
-       upkg_export_name(music, name, sizeof name);
+       u_object_export_name(music, name, sizeof name);
        FILE *fp = fopen(name, "wb");
        if (!fp) return EXIT_FAILURE;
-       upkg_export(music, fp);
+       u_object_export(music, fp);
        fclose(fp);
        printf("Wrote %s\n", name);