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

diff --git a/bluesky/serialize.c b/bluesky/serialize.c
index e3abc14..e453f49 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,15 +138,24 @@ 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)
 {
+    if (bluesky_verbose) {
+        g_log("bluesky/serialize", G_LOG_LEVEL_DEBUG,
+              "Deserializing inode %lld...", (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 +170,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:
@@ -200,9 +208,6 @@ BlueSkyInode *bluesky_deserialize_inode(BlueSkyFS *fs, const gchar *buf)
             g_hash_table_insert(inode->dirhash_folded, dirent->name_folded,
                                 dirent);
 
-            g_print("  dirent[%08x]: %s -> %"PRIu64"\n",
-                    dirent->cookie, dirent->name, dirent->inum);
-
             buf = strchr(d->name, '\0') + 1;
             d = (struct serialized_dirent *)buf;
         }
@@ -212,6 +217,7 @@ BlueSkyInode *bluesky_deserialize_inode(BlueSkyFS *fs, const gchar *buf)
     case BLUESKY_SYMLINK:
     {
         inode->symlink_contents = g_strdup(buf);
+        break;
     }
 
     default:
@@ -219,5 +225,5 @@ BlueSkyInode *bluesky_deserialize_inode(BlueSkyFS *fs, const gchar *buf)
                   inode->type);
     }
 
-    return inode;
+    return TRUE;
 }