refactor(db): add read_string_from_file method

headers/utils.h

@@ -37,4 +37,6 @@ void close_logs();
 bool is_integer(const char *value);
 uint32_t get_digit_count(int64_t number);
 
+void read_string_from_file(const int fd, string_t *string, const bool unallocated, const bool terminator);
+
 uint64_t hash(char *key);

src/database/get.c

@@ -23,17 +23,7 @@ void get_all_keys(const off_t from) {
     off_t start_at, end_at;
 
     // Key reading
-    {
-      const uint8_t byte_count = first >> 6;
-      key.len = 0;
-      read(fd, &key.len, byte_count);
-
-      key.len = (key.len << 6) | (first & 0b111111);
-      key.value = malloc(key.len + 1),
-
-      read(fd, key.value, key.len);
-      key.value[key.len] = '\0';
-    }
+    read_string_from_file(fd, &key, true, true);
 
     // Value reading
     {
@@ -261,20 +251,10 @@ struct KVPair *get_data(const char *key) {
           read(fd, &type, 1);
           if (type == 0x17) break;
 
-          {
-            uint8_t first;
-            read(fd, &first, 1);
-
-            const uint8_t byte_count = first >> 6;
-            name.len = 0;
-            read(fd, &name.len, byte_count);
-            name.len = (name.len << 6) | (first & 0b111111);
-
-            name.value = realloc(name.value, name.len + 1);
-            read(fd, name.value, name.len);
-            name.value[name.len] = '\0';
-          }
+          // Element key reading
+          read_string_from_file(fd, &name, false, true);
 
+          // Element value reading
           switch (type) {
             case TELLY_NULL:
               add_fv_to_hashtable(table, name, NULL, TELLY_NULL);
@@ -294,19 +274,7 @@ struct KVPair *get_data(const char *key) {
 
             case TELLY_STR: {
               string_t *string = malloc(sizeof(string_t));
-
-              uint8_t first;
-              read(fd, &first, 1);
-
-              const uint8_t byte_count = first >> 6;
-              string->len = 0;
-
-              read(fd, &string->len, byte_count);
-              string->len = (string->len << 6) | (first & 0b111111);
-
-              string->value = malloc(string->len);
-              read(fd, string->value, string->len);
-
+              read_string_from_file(fd, string, true, false);
               add_fv_to_hashtable(table, name, string, TELLY_STR);
               break;
             }
@@ -353,19 +321,7 @@ struct KVPair *get_data(const char *key) {
 
             case TELLY_STR: {
               string_t *string = malloc(sizeof(string_t));
-
-              uint8_t first;
-              read(fd, &first, 1);
-
-              const uint8_t byte_count = first >> 6;
-              string->len = 0;
-
-              read(fd, &string->len, byte_count);
-              string->len = (string->len << 6) | (first & 0b111111);
-
-              string->value = malloc(string->len);
-              read(fd, string->value, string->len);
-
+              read_string_from_file(fd, string, true, false);
               node = create_listnode(string, TELLY_STR);
               break;
             }

src/utils/string.c

@@ -1,8 +1,30 @@
 #include "../../headers/utils.h"
 
+#include <stdint.h>
+#include <stdlib.h>
 #include <ctype.h>
 
+#include <unistd.h>
+
 void to_uppercase(char *in, char *out) {
   while (*in != '\0') *(out++) = toupper(*(in++));
   *out = '\0';
 }
+
+void read_string_from_file(const int fd, string_t *string, const bool unallocated, const bool terminator) {
+  uint8_t first;
+  read(fd, &first, 1);
+
+  const uint8_t byte_count = first >> 6;
+  string->len = 0;
+  read(fd, &string->len, byte_count);
+  string->len = (string->len << 6) | (first & 0b111111);
+
+  const uint32_t size = terminator ? (string->len + 1) : string->len;
+
+  if (unallocated) string->value = malloc(size);
+  else string->value = realloc(string->value, size);
+
+  read(fd, string->value, string->len);
+  if (terminator) string->value[string->len] = '\0';
+}