X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fserialize.c;h=2b741b035a41f5b620ea4807782d562149fcb008;hb=f597cd5067ed36508118d2ecd29338e7b81f47e4;hp=6f31dcb9f4ffba5e40520f0fab40698d6f913345;hpb=d5e2f1643a99e57607e86173d832dbfa4f8b51c2;p=bluesky.git

diff --git a/bluesky/serialize.c b/bluesky/serialize.c
index 6f31dcb..2b741b0 100644
--- a/bluesky/serialize.c
+++ b/bluesky/serialize.c
@@ -129,6 +129,7 @@ void bluesky_serialize_inode(GString *out, BlueSkyInode *inode)
     {
         g_string_append(out, inode->symlink_contents);
         g_string_append_c(out, '\0');
+        break;
     }
 
     default:
@@ -137,21 +138,28 @@ 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);
     inode->gid = GUINT32_FROM_LE(raw->gid);
     inode->nlink = GUINT32_FROM_LE(raw->nlink);
     inode->change_count = GUINT64_FROM_LE(raw->change_count);
+    inode->change_commit = inode->change_count;
     inode->atime = GINT64_FROM_LE(raw->atime);
     inode->ctime = GINT64_FROM_LE(raw->ctime);
     inode->mtime = GINT64_FROM_LE(raw->mtime);
@@ -159,8 +167,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:
@@ -211,6 +217,7 @@ BlueSkyInode *bluesky_deserialize_inode(BlueSkyFS *fs, const gchar *buf)
     case BLUESKY_SYMLINK:
     {
         inode->symlink_contents = g_strdup(buf);
+        break;
     }
 
     default:
@@ -218,5 +225,5 @@ BlueSkyInode *bluesky_deserialize_inode(BlueSkyFS *fs, const gchar *buf)
                   inode->type);
     }
 
-    return inode;
+    return TRUE;
 }