#include "uobject.h"
#include "upkg.h"
#include "pack.h"
-#include "avl.h"
#define U_OBJECT_GET_PRIV(o) \
G_TYPE_INSTANCE_GET_PRIVATE(o, U_OBJECT_TYPE, struct uobject_priv)
struct upkg_file *f;
size_t base, len;
- struct avl_table *properties;
-
unsigned char buf[2048];
unsigned long nbuf;
};
-/* AVL tree functions. */
-static int propcmp(const void *_a, const void *_b, void *_data)
-{
- const struct uobject_property *a = _a, *b = _b;
- return strcmp(a->name, b->name);
-}
-
-static void propfree(void *item, void *data)
-{
- free(item);
-}
-
static unsigned long
get_real_size(unsigned long *real, unsigned size, unsigned char *buf, size_t n)
{
return 0;
g_value_init(&val, G_TYPE_UCHAR);
g_value_set_uchar(&val, priv->buf[len]);
- u_object_set_property(o, name, &val);
+ g_object_set_property(G_OBJECT(o), name, &val);
break;
case PROPERTY_INTEGER:
if (priv->nbuf-len < 4)
return 0;
g_value_init(&val, G_TYPE_ULONG);
g_value_set_ulong(&val, unpack_32_le(priv->buf+len));
- u_object_set_property(o, name, &val);
+ g_object_set_property(G_OBJECT(o), name, &val);
break;
default:
fprintf(stderr, "Unhandled property type %x\n", (unsigned)type);
static void u_object_init(UObject *o)
{
struct uobject_priv *priv = U_OBJECT_GET_PRIV(o);
- priv->properties = NULL;
-}
-
-void u_object_set_property(UObject *o, const char *name, const GValue *val)
-{
- struct uobject_priv *priv = U_OBJECT_GET_PRIV(o);
- struct uobject_property *prop, search = { .name = name };
- void **p;
-
- if (!priv->properties) {
- priv->properties = avl_create(propcmp, NULL, NULL);
- g_return_if_fail(priv->properties != NULL);
- }
-
- prop = avl_find(priv->properties, &search);
- if (prop) {
- g_value_unset(&prop->val);
- g_value_init(&prop->val, G_VALUE_TYPE(val));
- g_value_copy(val, &prop->val);
- return;
- }
-
- prop = malloc(sizeof *prop);
- g_return_if_fail(prop != NULL);
-
- *prop = (struct uobject_property) { .name = name };
- g_value_init(&prop->val, G_VALUE_TYPE(val));
- g_value_copy(val, &prop->val);
-
- g_return_if_fail(avl_probe(priv->properties, prop) != NULL);
-}
-
-const GValue *u_object_get_property(UObject *o, const char *name)
-{
- struct uobject_priv *priv = U_OBJECT_GET_PRIV(o);
- struct uobject_property *prop, search = { .name = name };
-
- if (!priv->properties)
- return NULL;
-
- prop = avl_find(priv->properties, &search);
- if (!prop)
- return NULL;
- return &prop->val;
-}
-
-static void u_object_finalize(GObject *o)
-{
- struct uobject_priv *priv = U_OBJECT_GET_PRIV(o);
-
- if (priv->properties) {
- avl_destroy(priv->properties, propfree);
- priv->properties = NULL;
- }
}
static void u_object_class_init(UObjectClass *class)
{
- GObjectClass *go = G_OBJECT_CLASS(class);
+ g_type_class_add_private(class, sizeof (struct uobject_priv));
class->deserialize = deserialize;
-
- g_type_class_add_private(class, sizeof (struct uobject_priv));
- go->finalize = u_object_finalize;
}
G_DEFINE_TYPE(UObject, u_object, G_TYPE_OBJECT);