Commit Graph

1084 Commits

Author SHA1 Message Date
Max Bruckner a1c022fef6 Merge pull request #37 from DaveGamble/reformatting
Reformat cJSON_Utils.c and test.c
2016-10-29 22:52:55 +07:00
Max Bruckner ddeca82718 reformatting: cJSON.c: fix indentation 2016-10-29 22:44:45 +07:00
Max Bruckner c0b17dc651 reformatting: cJSONUtils_GenerateMergePatch 2016-10-29 22:44:45 +07:00
Max Bruckner 01a813f642 reformatting: cJSONUtils_MergePatch 2016-10-29 22:44:45 +07:00
Max Bruckner c65514fcb4 reformatting: cJSONUtils_SortObject 2016-10-29 22:44:44 +07:00
Max Bruckner 8964287ec4 reformatting: cJSONUtils_SortList 2016-10-29 22:44:44 +07:00
Max Bruckner ec9d1cfedb reformatting: cJSONUtils_GeneratePatches 2016-10-29 22:44:44 +07:00
Max Bruckner 8879ed5dbc reformatting: cJSONUtils_CompareToPatch 2016-10-29 22:44:44 +07:00
Max Bruckner 52e53acfc3 reformatting: cJSON_AddPatchToArray 2016-10-29 22:44:43 +07:00
Max Bruckner d6a6abeca0 reformatting: cJSONUtils_GeneratePatch 2016-10-29 22:44:43 +07:00
Max Bruckner e8a67f0e4b reformatting: cJSONUtils_ApplyPatches 2016-10-29 22:44:43 +07:00
Max Bruckner d883f9b9b0 reformatting: cJSONUtils_ApplyPatch 2016-10-29 22:44:43 +07:00
Max Bruckner 284a8017b7 reformatting: cJSONUtils_Compare 2016-10-29 22:44:43 +07:00
Max Bruckner 1235c62235 reformatting: cJSONUtils_PatchDetach 2016-10-29 22:44:42 +07:00
Max Bruckner a21a124d40 reformatting: cJSONUtils_InplaceDecodePointerString 2016-10-29 22:44:42 +07:00
Max Bruckner 5713edb710 reformatting: cJSON_Utils_GetPointer
NOTE: This can change the assembly slightly, in my case it reordered two
instructions. This is due to the change from:

    which = (10 * which) + *pointer++ - '0';

to

    which = (10 * which) + (*pointer++ - '0');

This means that after the change, the subtraction runs before the
addition instead of after that. That shouldn't change the behavior
though.
2016-10-29 22:42:04 +07:00
Max Bruckner 0c23e8dde0 Merge pull request #40 from jfether/patch-1
Remove redundant test from cJSON_AddItemToArray
2016-10-28 14:06:39 +07:00
Jonathan Fether 9f00ff9a91 Remove redundant test from cJSON_AddItemToArray
The test for whether "c" is null is redundant.  Since this is the else case of "(!c)", and the only way "c" is changed is by the instruction assigning it "c->next" on the condition here, simply verifying that "c->next" isn't null is sufficient.
2016-10-27 20:02:44 -07:00
Ian Mobley d4836effc9 Fix compiler warning "array subscript has type char" when using arm-none-eabi-gcc 2016-10-17 17:20:57 -07:00
Max Bruckner 158ddceab3 reformatting: cJSONUtils_FindPointerFromObjectTo 2016-10-14 00:05:58 +07:00
Max Bruckner c6cb991e3f reformatting: cJSON.h: remove trailing spaces 2016-10-13 23:48:53 +07:00
Max Bruckner 7771225e35 reformatting: cJSONUtils_PointerEncodedstrcpy 2016-10-13 23:47:40 +07:00
Max Bruckner 3f6716e63a reformatting: cJSONUtils_PointerEncodedstrlen 2016-10-13 23:42:34 +07:00
Max Bruckner 2f002879c0 reformatting: cJSONUtils_Pstrcasecmp 2016-10-13 23:40:02 +07:00
Max Bruckner cb6445f47b reformatting: cJSON_strcasecmp 2016-10-13 23:26:53 +07:00
Max Bruckner 526d6b1312 reformatting: cJSON_Utils.h 2016-10-13 00:18:44 +07:00
Ian Mobley 85aa59be38 Use $(AR) environment variable with libcjson.a
Allow for alternative archive tool when using make.
2016-10-10 13:13:06 -07:00
Max Bruckner fcbeb1c36b reformatting: test.c 2016-10-11 00:34:19 +07:00
Max Bruckner 1822521a14 Merge pull request #36 from iMobs/const_objects
Add const qualifiers
2016-10-10 13:29:51 +07:00
Ian Mobley b393b3beeb Add const qualifier for non-destructive functions
Functions like cJSON_Print do not and should not modify the object passed
to them.
2016-10-07 15:42:11 -07:00
Max Bruckner f0fc6c50ba Merge pull request #29 from DaveGamble/reformatting
Reformatting code
2016-10-07 21:11:04 +07:00
Max Bruckner ad3d5130b5 reformatting: cJSON.h 2016-10-02 19:04:30 +07:00
Max Bruckner 34388c2d4c reformatting: cJSON_Minify 2016-10-02 19:04:30 +07:00
Max Bruckner 9adc6e7fe1 reformatting: cJSON_Duplicate 2016-10-02 19:04:30 +07:00
Max Bruckner e6fd236f00 reformatting: cJSON_CreateStringArray 2016-10-02 19:04:29 +07:00
Max Bruckner e272f7285e reformatting: cJSON_CreateDoubleArray 2016-10-02 19:04:29 +07:00
Max Bruckner 890b999e59 reformatting cJSON_CreateFloatArray 2016-10-02 19:04:29 +07:00
Max Bruckner f831aef5c1 reformatting: cJSON_CreateIntArray 2016-10-02 19:04:28 +07:00
Max Bruckner 21a0a88f19 reformatting: cJSON_CreateObject 2016-10-02 19:04:28 +07:00
Max Bruckner e241081020 reformatting: cJSON_CreateArray 2016-10-02 19:04:28 +07:00
Max Bruckner 034003ce2b reformatting: cJSON_CreateString 2016-10-02 19:04:28 +07:00
Max Bruckner 3f9f4970b4 reformatting: cJSON_CreateNumber 2016-10-02 19:04:27 +07:00
Max Bruckner 99f61f2b35 reformatting: cJSON_CreateBool 2016-10-02 19:04:27 +07:00
Max Bruckner a0b5d6b13a reformatting: cJSON_CreateFalse 2016-10-02 19:04:27 +07:00
Max Bruckner fdfb9fff86 reformatting: cJSON_CreateTrue 2016-10-02 19:04:27 +07:00
Max Bruckner cf7835b67d reformatting: cJSON_CreateNull 2016-10-02 19:04:26 +07:00
Max Bruckner 3a8043273e reformatting: cJSON_ReplaceItemInObject 2016-10-02 19:04:26 +07:00
Max Bruckner dc8eb30467 reformatting: cJSON_ReplaceItemInArray 2016-10-02 19:04:26 +07:00
Max Bruckner 69dcfcf238 reformatting: cJSON_InsertItemInArray 2016-10-02 19:04:26 +07:00
Max Bruckner 207bb05e8c reformatting: cJSON_DeleteItemFromObject 2016-10-02 19:04:25 +07:00