mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-03-21 14:09:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #240: add arbitrary use of val's in foreach loops to squash warnings about unused variables.

Browse Source
This commit is contained in:
Eric Haszlakiewicz
2016-07-30 18:27:53 +00:00
parent b366750e11
commit deb9fa482d
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/testReplaceExisting.c
View File

@@ -24,7 +24,7 @@ int main(int argc, char **argv)
int orig_count = 0; int orig_count = 0;
json_object_object_foreach(my_object, key0, val0) json_object_object_foreach(my_object, key0, val0)
{ {
printf("Key at index %d is [%s]", orig_count, key0); printf("Key at index %d is [%s] %d", orig_count, key0, (val0 == NULL));
if (strcmp(key0, "deleteme") == 0) if (strcmp(key0, "deleteme") == 0)
{ {
json_object_object_del(my_object, key0); json_object_object_del(my_object, key0);
@@ -41,7 +41,7 @@ int main(int argc, char **argv)
orig_count = 0; orig_count = 0;
json_object_object_foreach(my_object, key, val) json_object_object_foreach(my_object, key, val)
{ {
printf("Key at index %d is [%s]\n", orig_count, key); printf("Key at index %d is [%s] %d\n", orig_count, key, (val == NULL));
orig_count++; orig_count++;
if (strcmp(key, "foo2") != 0) if (strcmp(key, "foo2") != 0)
continue; continue;
@@ -56,7 +56,7 @@ int main(int argc, char **argv)
int retval = 0; int retval = 0;
json_object_object_foreach(my_object, key2, val2) json_object_object_foreach(my_object, key2, val2)
{ {
printf("Key at index %d is [%s]\n", new_count, key2); printf("Key at index %d is [%s] %d\n", new_count, key2, (val2 == NULL));
new_count++; new_count++;
if (strcmp(key2, "foo2") != 0) if (strcmp(key2, "foo2") != 0)
continue; continue;

20
tests/testReplaceExisting.expected
View File

@@ -1,15 +1,15 @@
==== delete-in-loop test starting ==== ==== delete-in-loop test starting ====
Key at index 0 is [foo1] (kept) Key at index 0 is [foo1] 0 (kept)
Key at index 1 is [foo2] (kept) Key at index 1 is [foo2] 0 (kept)
Key at index 2 is [deleteme] (deleted) Key at index 2 is [deleteme] 0 (deleted)
Key at index 3 is [foo3] (kept) Key at index 3 is [foo3] 0 (kept)
==== replace-value first loop starting ==== ==== replace-value first loop starting ====
Key at index 0 is [foo1] Key at index 0 is [foo1] 0
Key at index 1 is [foo2] Key at index 1 is [foo2] 0
replacing value for key [foo2] replacing value for key [foo2]
Key at index 2 is [foo3] Key at index 2 is [foo3] 0
==== second loop starting ==== ==== second loop starting ====
Key at index 0 is [foo1] Key at index 0 is [foo1] 0
Key at index 1 is [foo2] Key at index 1 is [foo2] 0
pointer for key [foo2] does match pointer for key [foo2] does match
Key at index 2 is [foo3] Key at index 2 is [foo3] 0