long datalen;
buflen = upkg_export_read(f, buf, sizeof buf);
- if (uo->pkg->version >= 63) {
+ if (f->pkg->version >= 63) {
/*
* There's an offset to the end of the image data here; not
* clear why it's useful since it's implied by the very next
/* At this point, the current file offset should match the one recorded
* above. */
- if (uo->pkg->version >= 63 && end_offset != (f->base + f->offset)) {
+ if (f->pkg->version >= 63 && end_offset != (f->base + f->offset)) {
u_err(uo, "mipmap end offset does not match data size");
goto err_free;
}
#include <uobject/uobject.h>
#include <uobject/module.h>
+#include <uobject/package.h>
#include "upkg.h"
#include "pack.h"
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;
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);
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;
}
struct UObject {
GObject parent;
- struct upkg *pkg;
+ GTypeModule *pkg;
struct upkg_file *pkg_file;
char *pkg_name;
};
GType u_object_get_type(void);
-int u_object_deserialize(GObject *obj, struct upkg *pkg, unsigned long idx);
+int u_object_deserialize(GObject *obj, GTypeModule *pkg, unsigned long idx);
-GObject *u_object_new_from_package(struct upkg *pkg, unsigned long idx);
+GObject *u_object_new_from_package(GTypeModule *pkg, unsigned long idx);
/* Logging helpers for UObject class implementations. */
void u_vlog_full(GObject *o, GLogLevelFlags level, const char *fmt, va_list ap);
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);
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 ret = 0;
for (unsigned i = 0; i < upkg->export_count; i++) {
- obj = u_object_new_from_package(upkg, i);
+ obj = u_object_new_from_package(pkg, i);
if (U_OBJECT_IS_EXPORTABLE(obj) && export(pkg, obj, i) != 0) {
ret = -1;
}