find_by functions skips the search on passed nod, therefore we can call it multiple times and get the next value

Author: Gedulis12

main.c

@@ -72,18 +72,63 @@ int main(int argc, char* argv[])
     {
         return 1; // failed to parse
     }
+    //
     // SOME TESTING
     JSONNode *key = gson_find_by_key(node, "\"gender\"");
     if (key != NULL)
+    {
         printf("1Found: %s\n", gson_get_key_value(key));
+    } else {
+        printf("1Key not found: gender\n");
+    }
+
+    key = gson_find_by_key(key, "\"gender\"");
+    if (key != NULL)
+    {
+        printf("Key found: %s\n", gson_get_key_value(key));
+    } else {
+        printf("Key not found: gender\n");
+    }
+
 
     JSONNode *val = gson_find_by_str_val(node, "\"male\"");
     if (val != NULL)
-        printf("2Found: %s\n", gson_get_str_value(val));
+    {
+        printf("Val found: %s\n", gson_get_str_value(val));
+    } else {
+        printf("Val not found: male\n");
+    }
+    val = gson_find_by_str_val(val, "\"male\"");
+    if (val != NULL)
+    {
+        printf("Val found: %s\n", gson_get_str_value(val));
+    } else {
+        printf("Val not found: male\n");
+    }
 
     JSONNode *_float = gson_find_by_float_val(node, 30);
     if (_float != NULL)
-        printf("3Found: %s:%f\n", gson_get_key_value(_float), gson_get_float_value(_float));
+    {
+        printf("Val found: %s:%f\n", gson_get_key_value(_float), gson_get_float_value(_float));
+    } else {
+        printf("Val not found: 30.00\n");
+    }
+
+    _float = gson_find_by_float_val(_float, 30);
+    if (_float != NULL)
+    {
+        printf("Val found: %s:%f\n", gson_get_key_value(_float), gson_get_float_value(_float));
+    } else {
+        printf("Val not found: 30.00\n");
+    }
+
+    _float = gson_find_by_float_val(_float, 30);
+    if (_float != NULL)
+    {
+        printf("Val found: %s:%f\n", gson_get_key_value(_float), gson_get_float_value(_float));
+    } else {
+        printf("Val not found: 30.00\n");
+    }
 
 
     if (_float != NULL)
@@ -113,4 +158,4 @@ int main(int argc, char* argv[])
     free(source);
 
     return 0;
-}
+}

src/gson.c

@@ -1001,11 +1001,15 @@ gson_debug_general(parser, curr);
 
 JSONNode* gson_find_by_key(JSONNode *node, char *key)
 {
+    JSONNode *orig = node;
     while (node != NULL)
     {
         if (node->key && strcmp(key, node->key) == 0)
         {
-            return node;
+            if (node != orig)
+            {
+                return node;
+            }
         }
         if (node->child)
         {
@@ -1028,13 +1032,17 @@ JSONNode* gson_find_by_key(JSONNode *node, char *key)
 
 JSONNode* gson_find_by_str_val(JSONNode *node, char *value)
 {
+    JSONNode *orig = node;
     while (node != NULL)
     {
         if (node->str_val
                 && strcmp(value, node->str_val) == 0
                 && node->type == JSON_STRING)
         {
-            return node;
+            if (node != orig)
+            {
+                return node;
+            }
         }
         if (node->child)
         {
@@ -1057,11 +1065,15 @@ JSONNode* gson_find_by_str_val(JSONNode *node, char *value)
 
 JSONNode* gson_find_by_float_val(JSONNode *node, float value)
 {
+    JSONNode *orig = node;
     while (node != NULL)
     {
         if (node->num_val && value == node->num_val && node->type == JSON_NUMBER)
         {
-            return node;
+            if (node != orig)
+            {
+                return node;
+            }
         }
         if (node->child)
         {
@@ -1122,4 +1134,4 @@ JSONType gson_get_bool_value(JSONNode *node)
     {
         return node->type;
     }
-}
+}

tests/mock_data/1_simple_json.json

@@ -13,5 +13,12 @@
             "name": "August",
             "age": 7
         }
+    ],
+    "siblings":
+    [
+        {
+            "name": "John",
+            "age": 30
+        }
     ]
-}
+}