Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix harmless compiler warnings in the new json_merge_patch() logic. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | json_mergepatch |
| Files: | files | file ages | folders |
| SHA3-256: |
5d2cf5a2f8afd88d041d89b3936042ce |
| User & Date: | drh 2017-03-23 00:46:15 |
Context
|
2017-03-23
| ||
| 12:56 | Avoid redundant edits in the json_merge_patch() function. check-in: 4a8e6437 user: drh tags: json_mergepatch | |
| 00:46 | Fix harmless compiler warnings in the new json_merge_patch() logic. check-in: 5d2cf5a2 user: drh tags: json_mergepatch | |
| 00:13 | Various fixes to the json_merge_patch() function. check-in: f49fd255 user: drh tags: json_mergepatch | |
Changes
Changes to ext/misc/json1.c.
1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 |
/* This is the RFC 7396 MergePatch algorithm.
*/
static JsonNode *jsonMergePatch(
JsonParse *pParse, /* The JSON parser that contains the TARGET */
int iTarget, /* Node of the TARGET in pParse */
JsonNode *pPatch /* The PATCH */
){
int i, j;
int iRoot;
JsonNode *pTarget;
if( pPatch->eType!=JSON_OBJECT ){
return pPatch;
}
assert( iTarget>=0 && iTarget<pParse->nNode );
pTarget = &pParse->aNode[iTarget];
assert( (pPatch->jnFlags & JNODE_APPEND)==0 );
|
| | |
1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 |
/* This is the RFC 7396 MergePatch algorithm.
*/
static JsonNode *jsonMergePatch(
JsonParse *pParse, /* The JSON parser that contains the TARGET */
int iTarget, /* Node of the TARGET in pParse */
JsonNode *pPatch /* The PATCH */
){
u32 i, j;
u32 iRoot;
JsonNode *pTarget;
if( pPatch->eType!=JSON_OBJECT ){
return pPatch;
}
assert( iTarget>=0 && iTarget<pParse->nNode );
pTarget = &pParse->aNode[iTarget];
assert( (pPatch->jnFlags & JNODE_APPEND)==0 );
|