Fix some minor issues in deletion process - Binary Tree and make the cjlib_json_set as it must be

Author: constarg

include/cjlib.h

@@ -246,7 +246,7 @@ static inline int cjlib_json_array_get(struct cjlib_json_data *restrict dst, int
  * @return 0 on success, otherwise -1.
 */
 extern int cjlib_json_object_set
-(cjlib_json_object *src, const char *restrict key,
+(cjlib_json_object **src, const char *restrict key,
  struct cjlib_json_data *restrict value, enum cjlib_json_datatypes datatype);
 
 /**
@@ -269,7 +269,7 @@ extern int cjlib_json_object_get
  * @return 0 on success, otherwise -1.
 */
 extern int cjlib_json_object_remove
-(struct cjlib_json_data *restrict dst, cjlib_json_object *src,
+(struct cjlib_json_data *restrict dst, cjlib_json_object **src,
  const char *key);
 
 /**
@@ -286,7 +286,7 @@ static CJLIB_ALWAYS_INLINE int cjlib_json_set
 (struct cjlib_json *restrict src, const char *restrict key,
  struct cjlib_json_data *restrict value, enum cjlib_json_datatypes datatype)
 {
-    return cjlib_json_object_set(src->c_dict, key, value, datatype);
+    return cjlib_json_object_set(&src->c_dict, key, value, datatype);
 }
 
 /**
@@ -313,10 +313,10 @@ static CJLIB_ALWAYS_INLINE int cjlib_json_get
  * @return 0 on success, otherwise -1.
 */
 static CJLIB_ALWAYS_INLINE int cjlib_json_remove
-(struct cjlib_json_data *restrict dst, const struct cjlib_json *restrict src,
+(struct cjlib_json_data *restrict dst, struct cjlib_json *restrict src,
  const char *restrict key)
 {
-    return cjlib_json_object_remove(dst, src->c_dict, key);
+    return cjlib_json_object_remove(dst, &src->c_dict, key);
 }
 
 /**

src/cjlib.c

@@ -120,11 +120,18 @@ static inline char *incomplete_property_str_expand_state
 }
 
 int cjlib_json_object_set
-(cjlib_json_object *src, const char *restrict key,
+(cjlib_json_object **src, const char *restrict key,
  struct cjlib_json_data *restrict value, enum cjlib_json_datatypes datatype)
 {
+    struct cjlib_json_data dummy;
+
+    // Remove the previous contents (if exists).
+    (void) cjlib_json_object_remove(&dummy, src, key);
+    cjlib_json_data_destroy(&dummy);
+
+    // (change/set) the record.
     value->c_datatype = datatype;
-    if (-1 == cjlib_dict_insert(value, &src, key)) return -1;
+    if (-1 == cjlib_dict_insert(value, src, key)) return -1;
     return 0;
 }
 
@@ -144,16 +151,16 @@ int cjlib_json_object_get
 }
 
 int cjlib_json_object_remove
-(struct cjlib_json_data *restrict dst, cjlib_json_object *src,
+(struct cjlib_json_data *restrict dst, cjlib_json_object **src,
  const char *restrict key)
 {
     // dst == NULL, then you can skip the return value.
     if (NULL == dst) goto perform_deletion;
 
-    if (-1 == cjlib_json_object_get(dst, src, key)) return -1;
+    if (-1 == cjlib_json_object_get(dst, *src, key)) return -1;
 
 perform_deletion:
-    if (-1 == cjlib_dict_remove(&src, key)) return -1;
+    if (-1 == cjlib_dict_remove(src, key)) return -1;
 
     return 0;
 }

src/cjlib_dictionary.c

@@ -712,8 +712,10 @@ int cjlib_dict_remove(struct avl_bs_tree_node **dict, const char *restrict key)
         largest_key_of_left_subtree_parent = search_node(*dict, largest_key_of_left_subtree->avl_key,
                                                          S_RETRIEVE_KEY_NODE_PARENT);
 
-        removed->avl_key = largest_key_of_left_subtree->avl_key;
-        (void) memcpy(largest_key_of_left_subtree->avl_data, removed->avl_data, sizeof(struct cjlib_json_data));
+        free(removed->avl_key);
+        removed->avl_key = strdup(largest_key_of_left_subtree->avl_key);
+        (void) memcpy(removed->avl_data, largest_key_of_left_subtree->avl_data, sizeof(struct cjlib_json_data));
+        //(void) memcpy(largest_key_of_left_subtree->avl_data, removed->avl_data, sizeof(struct cjlib_json_data));
 
         removed = largest_key_of_left_subtree;
         parent  = largest_key_of_left_subtree_parent;
@@ -723,11 +725,21 @@ int cjlib_dict_remove(struct avl_bs_tree_node **dict, const char *restrict key)
     if (removed->avl_left) child_of_removed = removed->avl_left;
     else child_of_removed                   = removed->avl_right;
 
+    if (is_root) {
+        *dict = child_of_removed;
+    } else {
+        if (parent->avl_left == removed) {
+            parent->avl_left = child_of_removed;
+        } else {
+            parent->avl_right = child_of_removed;
+        }
+    }
+    /*
     if (parent->avl_left == removed) {
         parent->avl_left = child_of_removed;
     } else {
         parent->avl_right = child_of_removed;
-    }
+    }*/
 
     perform_rotation_after_delete(removed, dict);
 

tests/src/main.c

@@ -21,6 +21,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <string.h>
+
 #include "cjlib.h"
 
 #include "cjlib_list.h"
@@ -50,11 +52,14 @@ int main(void)
 
     cjlib_json_read(&json_file);
 
-    /*if (-1 == cjlib_json_get(&dst, &json_file, "programming_languages")) {
+    if (-1 == cjlib_json_get(&dst, &json_file, "version")) {
         (void) printf("Error\n");
         exit(-1);
     }
 
+    (void) printf("%s\n", dst.c_value.c_str);
+
+    /*
     struct cjlib_json_data test;
     CJLIB_LIST_FOR_EACH(test, dst.c_value.c_arr, struct cjlib_json_data) {
         (void) printf("%s\n", test.c_value.c_str);
@@ -86,8 +91,9 @@ int main(void)
     (void) printf("%s\n", dst.c_value.c_str);*/
 
 
-    free((void *) cjlib_json_stringtify(&json_file));
+    //free((void *) cjlib_json_stringtify(&json_file));
 
+    //cjlib_json_dump(&json_file);
     // // Close the json file.
     cjlib_json_close(&json_file);
 }