X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fserialize.c;h=44233a147be0a4aceaae1f4b6a813686dedc51aa;hb=a8a9f2181e2e16d24d812ea1e7a7c8af42f0d2f1;hp=5eb7c1d2dd1baeba0eeb208d15ebbf187dfcb8da;hpb=d514caf49faff9295d0e497d3b6b8856fe83f8d0;p=bluesky.git

diff --git a/bluesky/serialize.c b/bluesky/serialize.c
index 5eb7c1d..44233a1 100644
--- a/bluesky/serialize.c
+++ b/bluesky/serialize.c
@@ -93,9 +93,11 @@ void bluesky_serialize_inode(GString *out, BlueSkyInode *inode)
         g_string_append_len(out, (gchar *)&size, sizeof(uint64_t));
         for (int i = 0; i < inode->blocks->len; i++) {
             BlueSkyBlock *b = &g_array_index(inode->blocks, BlueSkyBlock, i);
-            if (b->ref != NULL)
-                g_string_append(out, b->ref);
-            g_string_append_c(out, '\0');
+            BlueSkyCloudID id;
+            memset(&id, 0, sizeof(id));
+            if (b->cloudref != NULL)
+                id = b->cloudref->id;
+            g_string_append_len(out, (const char *)&id, sizeof(id));
         }
         break;
     }
@@ -129,6 +131,7 @@ void bluesky_serialize_inode(GString *out, BlueSkyInode *inode)
     {
         g_string_append(out, inode->symlink_contents);
         g_string_append_c(out, '\0');
+        break;
     }
 
     default:
@@ -141,7 +144,10 @@ void bluesky_serialize_inode(GString *out, BlueSkyInode *inode)
  * 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);
+    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;
 
@@ -174,12 +180,15 @@ gboolean bluesky_deserialize_inode(BlueSkyInode *inode, const gchar *buf)
         g_array_set_size(inode->blocks,
                          (inode->size + BLUESKY_BLOCK_SIZE - 1)
                           / BLUESKY_BLOCK_SIZE);
+        // TODO
+#if 0
         for (int i = 0; i < inode->blocks->len; i++) {
             BlueSkyBlock *b = &g_array_index(inode->blocks, BlueSkyBlock, i);
             b->type = BLUESKY_BLOCK_REF;
             b->ref = g_strdup(buf);
             buf += strlen(b->ref) + 1;
         }
+#endif
         break;
 
     case BLUESKY_DIRECTORY:
@@ -204,9 +213,6 @@ gboolean bluesky_deserialize_inode(BlueSkyInode *inode, 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;
         }
@@ -216,6 +222,7 @@ gboolean bluesky_deserialize_inode(BlueSkyInode *inode, const gchar *buf)
     case BLUESKY_SYMLINK:
     {
         inode->symlink_contents = g_strdup(buf);
+        break;
     }
 
     default: