瀏覽代碼

cJSON_ParseWithOptions: Improve variable names and intent

Max Bruckner 8 年之前
父節點
當前提交
11131b9ced
共有 1 個文件被更改,包括 11 次插入11 次删除
  1. 11 11
      cJSON.c

+ 11 - 11
cJSON.c

@@ -903,19 +903,19 @@ CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return
 {
     const unsigned char *end = NULL;
     /* use global error pointer if no specific one was given */
-    const unsigned char **ep = return_parse_end ? (const unsigned char**)return_parse_end : &global_ep;
-    cJSON *c = cJSON_New_Item(&global_hooks);
-    *ep = NULL;
-    if (!c) /* memory fail */
+    const unsigned char **error_pointer = (return_parse_end != NULL) ? (const unsigned char**)return_parse_end : &global_ep;
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    *error_pointer = NULL;
+    if (item == NULL) /* memory fail */
     {
         return NULL;
     }
 
-    end = parse_value(c, skip_whitespace((const unsigned char*)value), ep, &global_hooks);
-    if (!end)
+    end = parse_value(item, skip_whitespace((const unsigned char*)value), error_pointer, &global_hooks);
+    if (end == NULL)
     {
         /* parse failure. ep is set. */
-        cJSON_Delete(c);
+        cJSON_Delete(item);
         return NULL;
     }
 
@@ -923,10 +923,10 @@ CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return
     if (require_null_terminated)
     {
         end = skip_whitespace(end);
-        if (*end)
+        if (*end != '\0')
         {
-            cJSON_Delete(c);
-            *ep = end;
+            cJSON_Delete(item);
+            *error_pointer = end;
             return NULL;
         }
     }
@@ -935,7 +935,7 @@ CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return
         *return_parse_end = (const char*)end;
     }
 
-    return c;
+    return item;
 }
 
 /* Default options for cJSON_Parse */