Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
fcbeb1c
reformatting: test.c
FSMaxB Oct 10, 2016
526d6b1
reformatting: cJSON_Utils.h
FSMaxB Oct 12, 2016
cb6445f
reformatting: cJSON_strcasecmp
FSMaxB Oct 13, 2016
2f00287
reformatting: cJSONUtils_Pstrcasecmp
FSMaxB Oct 13, 2016
3f6716e
reformatting: cJSONUtils_PointerEncodedstrlen
FSMaxB Oct 13, 2016
7771225
reformatting: cJSONUtils_PointerEncodedstrcpy
FSMaxB Oct 13, 2016
c6cb991
reformatting: cJSON.h: remove trailing spaces
FSMaxB Oct 13, 2016
158ddce
reformatting: cJSONUtils_FindPointerFromObjectTo
FSMaxB Oct 13, 2016
5713edb
reformatting: cJSON_Utils_GetPointer
FSMaxB Oct 13, 2016
a21a124
reformatting: cJSONUtils_InplaceDecodePointerString
FSMaxB Oct 15, 2016
1235c62
reformatting: cJSONUtils_PatchDetach
FSMaxB Oct 16, 2016
284a801
reformatting: cJSONUtils_Compare
FSMaxB Oct 16, 2016
d883f9b
reformatting: cJSONUtils_ApplyPatch
FSMaxB Oct 17, 2016
e8a67f0
reformatting: cJSONUtils_ApplyPatches
FSMaxB Oct 17, 2016
d6a6abe
reformatting: cJSONUtils_GeneratePatch
FSMaxB Oct 17, 2016
52e53ac
reformatting: cJSON_AddPatchToArray
FSMaxB Oct 17, 2016
8879ed5
reformatting: cJSONUtils_CompareToPatch
FSMaxB Oct 17, 2016
ec9d1cf
reformatting: cJSONUtils_GeneratePatches
FSMaxB Oct 17, 2016
8964287
reformatting: cJSONUtils_SortList
FSMaxB Oct 28, 2016
c65514f
reformatting: cJSONUtils_SortObject
FSMaxB Oct 28, 2016
01a813f
reformatting: cJSONUtils_MergePatch
FSMaxB Oct 29, 2016
c0b17dc
reformatting: cJSONUtils_GenerateMergePatch
FSMaxB Oct 29, 2016
ddeca82
reformatting: cJSON.c: fix indentation
FSMaxB Oct 29, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cJSON.c
Original file line number Diff line number Diff line change
Expand Up @@ -1722,7 +1722,7 @@ cJSON *cJSON_DetachItemFromArray(cJSON *array, int which)
/* item doesn't exist */
return 0;
}
if (c->prev)
if (c->prev)
{
/* not the first element */
c->prev->next = c->next;
Expand Down
10 changes: 5 additions & 5 deletions cJSON.h
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
/*
Copyright (c) 2009 Dave Gamble

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
Expand All @@ -36,7 +36,7 @@ extern "C"
#define cJSON_String (1 << 4)
#define cJSON_Array (1 << 5)
#define cJSON_Object (1 << 6)

#define cJSON_IsReference 256
#define cJSON_StringIsConst 512

Expand Down Expand Up @@ -93,7 +93,7 @@ extern cJSON *cJSON_GetObjectItem(const cJSON *object, const char *string);
extern int cJSON_HasObjectItem(const cJSON *object, const char *string);
/* For analysing failed parses. This returns a pointer to the parse error. You'll probably need to look a few chars back to make sense of it. Defined when cJSON_Parse() returns 0. 0 when cJSON_Parse() succeeds. */
extern const char *cJSON_GetErrorPtr(void);

/* These calls create a cJSON item of the appropriate type. */
extern cJSON *cJSON_CreateNull(void);
extern cJSON *cJSON_CreateTrue(void);
Expand Down
Loading