Improve readability, remove an assert, add an error printout.

1 files changed, 12 insertions, 19 deletions

diff --git a/c_src/permdb.c b/c_src/permdb.c
index 153e2f1..74225ea 100644
--- a/c_src/permdb.c
+++ b/c_src/permdb.c
@@ -45,7 +45,6 @@ static const node_object errornode = {{NODE_ENTRY_ERROR_NODE,
                                        NODE_ENTRY_ERROR_NODE,
                                        NODE_ENTRY_ERROR_NODE}};
 
-
 struct nodecache {
         node_object value;
         ps_string *key;
@@ -210,15 +209,14 @@ validate_checksum(struct commit_info *commit, buffered_file *file)
                 (stderr,
                  "validate_checksum: read from file: length %llu start %llu\n",
                  commit->length, commit->start));
-        unsigned char *checksumdata = bf_read(file, commit->start,
-                                              commit->length, NULL);
 
+        unsigned char *checksumdata =
+                bf_read(file, commit->start, commit->length, NULL);
         if (checksumdata == NULL) {
                 return -1;
         }
 
         uint8_t checksum[SHA256_DIGEST_SIZE];
-
         struct sha256_ctx commit_checksum_context;
         sha256_init(&commit_checksum_context);
         sha256_update(&commit_checksum_context, commit->length, checksumdata);
@@ -230,7 +228,6 @@ validate_checksum(struct commit_info *commit, buffered_file *file)
         }
 
         free(checksumdata);
-
         return -1;
 }
 
@@ -1016,19 +1013,15 @@ committree(permdb_object *state)
                         (unsigned long long) bf_total_length(state->indexfile)));
         struct nodecache *node, *tmp;
         HASH_ITER(hh, state->dirtynodes, node, tmp) {
-                assert(get_entry_in_node(node->value, 0)
-                       != NODE_ENTRY_DIRTY_NODE);
-                assert(get_entry_in_node(node->value, 1)
-                       != NODE_ENTRY_DIRTY_NODE);
-                assert(get_entry_in_node(node->value, 2)
-                       != NODE_ENTRY_DIRTY_NODE);
-                assert(get_entry_in_node(node->value, 3)
-                       != NODE_ENTRY_DIRTY_NODE);
+                assert(get_entry_in_node(node->value, 0)!=NODE_ENTRY_DIRTY_NODE);
+                assert(get_entry_in_node(node->value, 1)!=NODE_ENTRY_DIRTY_NODE);
+                assert(get_entry_in_node(node->value, 2)!=NODE_ENTRY_DIRTY_NODE);
+                assert(get_entry_in_node(node->value, 3)!=NODE_ENTRY_DIRTY_NODE);
                 node_offset offset = writenode(state, node->value, node->key);
                 size_t keylength = node->key->length;
                 if (keylength != 0) {
-                        ps_string *parent = ps_resize(node->key,
-                                                      node->key->length - 1);
+                        ps_string *parent =
+                                ps_resize(node->key, node->key->length - 1);
                         unsigned int entrynumber = (unsigned int)
                                 (node->key->value[keylength - 1] - '0');
                         node_object parentnode =
@@ -1105,13 +1098,14 @@ portloop(permdb_object *state)
                         dprintf(PORT, (stderr, "get\n"));
                         if (len != keylen+1) {
                                 write_reply(NULL, 0, 4);
+                                fprintf(stderr, "invalid getvalue command, "
+                                        "length was %zd\n", len);
                                 continue;
                         }
-                        assert(len == keylen+1);
 
                         size_t datalen;
-                        unsigned char *result = getvalue(state, (buf+1), keylen,
-                                                         &datalen);
+                        unsigned char *result =
+                                getvalue(state, (buf+1), keylen, &datalen);
 
                         if (result == NULL) {
                                 write_reply(NULL, 0, 4);
@@ -1132,7 +1126,6 @@ portloop(permdb_object *state)
                         size_t datalen = (size_t) (len - keylen - 1);
                         unsigned char *key = buf + 1;
                         unsigned char *data = key + keylen;
-
                         int result =
                                 addvalue(state, key, keylen, data, datalen, 0);