vsndrg/jq
1
0 Fork 0
mirror of https://github.com/jqlang/jq.git synced 2026-11-02 17:51:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant code from jv_object_contains

Browse Source
This commit is contained in:
Stephen Roantree committed 2012-10-25 06:29:23 -07:00
1 parent ecc8998d38
commit 1b556315af
1 file changed
+5 -21
Download Patch File Download Diff File Expand all files Collapse all files
jv.c
+5 -21
View File
@@ -890,33 +890,17 @@ int jv_object_contains(jv a, jv b) {
assert(jv_get_kind(b) == JV_KIND_OBJECT);
int r = 1;
int nkeys = jv_object_length(jv_copy(b));
jv* keys = malloc(sizeof(jv) * nkeys);
int kidx = 0;
jv_object_foreach(i, b) {
keys[kidx++] = jv_object_iter_key(b, i);
}
jv key = jv_object_iter_key(b, i);
jv a_val = jv_object_get(jv_copy(a), jv_copy(key));
jv b_val = jv_object_get(jv_copy(b), jv_copy(key));
for (int i=0; i < nkeys; i++) {
jv a_val = jv_object_get(jv_copy(a), jv_copy(keys[i]));
jv b_val = jv_object_get(jv_copy(b), jv_copy(keys[i]));
if (!(jv_get_kind(a_val) == jv_get_kind(b_val)
&& jv_contains(jv_copy(a_val), jv_copy(b_val)))) {
r = 0;
}
jv_free(a_val);
jv_free(b_val);
r = jv_contains(a_val, b_val);
jv_free(key);
if (!r) break;
}
for (int i=0; i < nkeys; i++) {
jv_free(keys[i]);
}
free(keys);
jv_free(a);
jv_free(b);
return r;