From 6b35f1c5bc347377ea32881914a0fe5d60e730e6 Mon Sep 17 00:00:00 2001 From: Alanscut Date: Tue, 24 Mar 2020 22:28:15 +0800 Subject: [PATCH] add new function of setValuestringToObject --- cJSON.c | 25 +++++++++++++++++++++++++ cJSON.h | 2 ++ 2 files changed, 27 insertions(+) diff --git a/cJSON.c b/cJSON.c index b0e744e..ff8d2b9 100644 --- a/cJSON.c +++ b/cJSON.c @@ -368,6 +368,31 @@ CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number) return object->valuedouble = number; } +CJSON_PUBLIC(char*) cJSON_SetValuestringToObject(cJSON *object, const char *valuestring) +{ + size_t length = 0; + char *copy = NULL; + /* if object->valuestring is NULL, it should not set valuestring */ + if (object->valuestring == NULL) + { + return NULL; + } + length = strlen(valuestring) + sizeof(""); + copy = (char*) cJSON_malloc(length); + if (copy == NULL) + { + return NULL; + } + memcpy(copy, valuestring, length); + if (!(object->type & cJSON_IsReference) && (object->valuestring != NULL)) + { + cJSON_free(object->valuestring); + } + object->valuestring = copy; + + return copy; +} + typedef struct { unsigned char *buffer; diff --git a/cJSON.h b/cJSON.h index 2c53562..1455ece 100644 --- a/cJSON.h +++ b/cJSON.h @@ -278,6 +278,8 @@ CJSON_PUBLIC(cJSON*) cJSON_AddArrayToObject(cJSON * const object, const char * c /* helper for the cJSON_SetNumberValue macro */ CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number); #define cJSON_SetNumberValue(object, number) ((object != NULL) ? cJSON_SetNumberHelper(object, (double)number) : (number)) +/* Only takes effect when type of object is JSON_Object */ +CJSON_PUBLIC(char*) cJSON_SetValuestringToObject(cJSON *object, const char *valuestring); /* Macro for iterating over an array or object */ #define cJSON_ArrayForEach(element, array) for(element = (array != NULL) ? (array)->child : NULL; element != NULL; element = element->next)