X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fserialize.c;h=5eb7c1d2dd1baeba0eeb208d15ebbf187dfcb8da;hb=8a2da0db5d5f4f599486876396883f6207ebec6a;hp=e3abc141600f9f347bac0688b90db10a58981247;hpb=365e57979887238629402d8c0b2c2cae65e852fe;p=bluesky.git

diff --git a/bluesky/serialize.c b/bluesky/serialize.c
index e3abc14..5eb7c1d 100644
--- a/bluesky/serialize.c
+++ b/bluesky/serialize.c
@@ -137,15 +137,21 @@ void bluesky_serialize_inode(GString *out, BlueSkyInode *inode)
     }
 }
 
-BlueSkyInode *bluesky_deserialize_inode(BlueSkyFS *fs, const gchar *buf)
+/* Deserialize an inode into an in-memory representation.  Returns a boolean
+ * indicating whether the deserialization was successful. */
+gboolean bluesky_deserialize_inode(BlueSkyInode *inode, const gchar *buf)
 {
+    g_print("Deserializing inode %lld...\n", (long long)inode->inum);
+
     struct serialized_inode *raw = (struct serialized_inode *)buf;
 
     if (GUINT64_FROM_LE(raw->signature) != INODE_MAGIC)
-        return NULL;
+        return FALSE;
 
-    BlueSkyInode *inode = bluesky_new_inode(GUINT64_FROM_LE(raw->inum),
-                                            fs, GUINT32_FROM_LE(raw->type));
+    if (inode->inum != GUINT64_FROM_LE(raw->inum))
+        return FALSE;
+
+    bluesky_init_inode(inode, GUINT32_FROM_LE(raw->type));
 
     inode->mode = GUINT32_FROM_LE(raw->mode);
     inode->uid = GUINT32_FROM_LE(raw->uid);
@@ -160,8 +166,6 @@ BlueSkyInode *bluesky_deserialize_inode(BlueSkyFS *fs, const gchar *buf)
 
     buf += sizeof(struct serialized_inode);
 
-    g_print("Deserializing inode %lld...\n", (long long)inode->inum);
-
     /* TODO: Bounds checking */
     switch (inode->type) {
     case BLUESKY_REGULAR:
@@ -219,5 +223,5 @@ BlueSkyInode *bluesky_deserialize_inode(BlueSkyFS *fs, const gchar *buf)
                   inode->type);
     }
 
-    return inode;
+    return TRUE;
 }