mirror/cJSON
1
0
Fork 0
mirror of https://github.com/DaveGamble/cJSON.git synced 2023-08-10 21:13:26 +03:00
Code Issues Projects Releases Wiki Activity

Renaming "min" to "cjson_min".

Browse Source
This commit is contained in:
Pawel Winogrodzki 2017-03-30 15:47:06 -07:00 committed by Max Bruckner
parent c786cd9714
commit 2148e3277a
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cJSON.c
View File

@ -1046,9 +1046,7 @@ CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value)
return cJSON_ParseWithOpts(value, 0, 0); return cJSON_ParseWithOpts(value, 0, 0);
} }
#ifndef min #define cjson_min(a, b) ((a < b) ? a : b)
#define min(a, b) ((a < b) ? a : b)
#endif
static unsigned char *print(const cJSON * const item, cJSON_bool format, const internal_hooks * const hooks) static unsigned char *print(const cJSON * const item, cJSON_bool format, const internal_hooks * const hooks)
{ {
@ -1087,7 +1085,7 @@ static unsigned char *print(const cJSON * const item, cJSON_bool format, const i
{ {
goto fail; goto fail;
} }
memcpy(printed, buffer->buffer, min(buffer->length, buffer->offset + 1)); memcpy(printed, buffer->buffer, cjson_min(buffer->length, buffer->offset + 1));
printed[buffer->offset] = '\0'; /* just to be sure */ printed[buffer->offset] = '\0'; /* just to be sure */
/* free the buffer */ /* free the buffer */