瀏覽代碼

Rename some variables to avoid shadowing.

Stephan Gatzka 8 年之前
父節點
當前提交
7ed067e680
共有 1 個文件被更改,包括 11 次插入11 次删除
  1. 11 11
      test_utils.c

+ 11 - 11
test_utils.c

@@ -96,14 +96,14 @@ int main(void)
     printf("JSON Apply Patch Tests\n");
     printf("JSON Apply Patch Tests\n");
     for (i = 0; i < 15; i++)
     for (i = 0; i < 15; i++)
     {
     {
-        cJSON *object = cJSON_Parse(patches[i][0]);
+        cJSON *object_to_be_patched = cJSON_Parse(patches[i][0]);
         cJSON *patch = cJSON_Parse(patches[i][1]);
         cJSON *patch = cJSON_Parse(patches[i][1]);
-        int err = cJSONUtils_ApplyPatches(object, patch);
-        char *output = cJSON_Print(object);
+        int err = cJSONUtils_ApplyPatches(object_to_be_patched, patch);
+        char *output = cJSON_Print(object_to_be_patched);
         printf("Test %d (err %d):\n%s\n\n", i + 1, err, output);
         printf("Test %d (err %d):\n%s\n\n", i + 1, err, output);
 
 
         free(output);
         free(output);
-        cJSON_Delete(object);
+        cJSON_Delete(object_to_be_patched);
         cJSON_Delete(patch);
         cJSON_Delete(patch);
     }
     }
 
 
@@ -168,19 +168,19 @@ int main(void)
     printf("JSON Merge Patch tests\n");
     printf("JSON Merge Patch tests\n");
     for (i = 0; i < 15; i++)
     for (i = 0; i < 15; i++)
     {
     {
-        cJSON *object = cJSON_Parse(merges[i][0]);
+        cJSON *object_to_be_merged = cJSON_Parse(merges[i][0]);
         cJSON *patch = cJSON_Parse(merges[i][1]);
         cJSON *patch = cJSON_Parse(merges[i][1]);
-        char *before = cJSON_PrintUnformatted(object);
+        char *before_merge = cJSON_PrintUnformatted(object_to_be_merged);
         patchtext = cJSON_PrintUnformatted(patch);
         patchtext = cJSON_PrintUnformatted(patch);
-        printf("Before: [%s] -> [%s] = ", before, patchtext);
-        object = cJSONUtils_MergePatch(object, patch);
-        after = cJSON_PrintUnformatted(object);
+        printf("Before: [%s] -> [%s] = ", before_merge, patchtext);
+        object_to_be_merged = cJSONUtils_MergePatch(object_to_be_merged, patch);
+        after = cJSON_PrintUnformatted(object_to_be_merged);
         printf("[%s] vs [%s] (%s)\n", after, merges[i][2], strcmp(after, merges[i][2]) ? "FAIL" : "OK");
         printf("[%s] vs [%s] (%s)\n", after, merges[i][2], strcmp(after, merges[i][2]) ? "FAIL" : "OK");
 
 
-        free(before);
+        free(before_merge);
         free(patchtext);
         free(patchtext);
         free(after);
         free(after);
-        cJSON_Delete(object);
+        cJSON_Delete(object_to_be_merged);
         cJSON_Delete(patch);
         cJSON_Delete(patch);
     }
     }