X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/82568fc97fa528e92f2de5e97717b542b921ccf3..67b795eeb9c9515adb9450562a3e7e15eb63a21d:/src/uobject/uobject.c

diff --git a/src/uobject/uobject.c b/src/uobject/uobject.c
index 867390f..3bada24 100644
--- a/src/uobject/uobject.c
+++ b/src/uobject/uobject.c
@@ -279,6 +279,21 @@ out:
 	return obj;
 }
 
+GObject *u_object_get_by_link(GObject *go, long index)
+{
+	g_return_val_if_fail(IS_U_OBJECT(go), NULL);
+	UObject *uo = U_OBJECT(go);
+
+	if (index == 0)
+		return NULL;
+
+	if (index < 0) {
+		return get_import_object(uo, -(index+1));
+	}
+
+	return u_object_new_from_package(uo->pkg, index-1);
+}
+
 static int decode_object_property(UObject *uo, GValue *val, unsigned long len)
 {
 	struct u_object_priv *priv = U_OBJECT_GET_PRIV(uo);
@@ -287,55 +302,15 @@ static int decode_object_property(UObject *uo, GValue *val, unsigned long len)
 	int rc;
 
 	rc = upkg_decode_index(&index, priv->buf+len, priv->nbuf-len);
-	if (rc == 0 || index == 0)
+	if (rc == 0)
 		return -1;
 
-	if (index < 0) {
-		obj = get_import_object(uo, -(index+1));
-	} else {
-		obj = u_object_new_from_package(uo->pkg, index-1);
-	}
-
+	obj = u_object_get_by_link(G_OBJECT(uo), index);
 	g_value_init(val, U_TYPE_OBJECT);
 	g_value_take_object(val, obj);
 	return 0;
 }
 
-/*
- * Deserialize an IEEE 754 binary32 value in "little endian" (for whatever
- * that term is worth in this context).  That is, when interpreted as a little
- * endian 32-bit unsigned integer: bit 31 is the sign, bits 30-23 are the
- * (biased) exponent, and bits 22-0 are the encoded part of the significand.
- *
- * The implementation is designed to be agnostic of the platform's actual
- * float type, but the conversion may be lossy if "float" is not itself a
- * binary32 format.  NaN payloads are not preserved.
- */
-static float unpack_binary32_le(const unsigned char *buf)
-{
-	unsigned long raw;
-	long significand;
-	int exponent;
-	float result;
-
-	raw = unpack_32_le(buf);
-	exponent = (raw & 0x7f800000) >> 23;
-	significand = (raw & 0x007fffff) >> 0;
-
-	switch (exponent) {
-	case 255:
-		result = significand ? NAN : INFINITY;
-		break;
-	default:
-		significand |= 0x00800000;
-		/* fall through */
-	case 0:
-		result = ldexpf(significand, exponent-126-24);
-	}
-
-	return copysignf(result, raw & 0x80000000 ? -1 : 1);
-}
-
 static unsigned long deserialize_property(UObject *uo, struct prop_head *head)
 {
 	struct u_object_priv *priv = U_OBJECT_GET_PRIV(uo);
@@ -387,7 +362,7 @@ static unsigned long deserialize_property(UObject *uo, struct prop_head *head)
 		if (head->size != 4 || priv->nbuf-len < head->size)
 			return 0;
 		g_value_init(&val, G_TYPE_FLOAT);
-		g_value_set_float(&val, unpack_binary32_le(priv->buf+len));
+		g_value_set_float(&val, u_unpack_binary32_le(priv->buf+len));
 		g_object_set_property(G_OBJECT(uo), head->prop_name, &val);
 		break;
 	default: