/ Check-in [c2c3dd84]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix a harmless compiler warning in the JSON1 extension.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: c2c3dd84534bb5ea81c974847b74a166c9cba1545fc749ce625929f303bf22e4
User & Date: drh 2017-03-24 19:45:05
Context
2017-03-25
12:08
Fix two harmless compiler warnings. check-in: 32be9c3f user: drh tags: trunk
2017-03-24
19:45
Fix a harmless compiler warning in the JSON1 extension. check-in: c2c3dd84 user: drh tags: trunk
18:38
Previous check-in was not correct. This is a better fix for the OP_Once problem of ticket [06796225f59c057cd120f1]. check-in: 8194dd28 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to ext/misc/json1.c.

  1393   1393     assert( (pPatch->jnFlags & JNODE_APPEND)==0 );
  1394   1394     if( pTarget->eType!=JSON_OBJECT ){
  1395   1395       jsonRemoveAllNulls(pPatch);
  1396   1396       return pPatch;
  1397   1397     }
  1398   1398     iRoot = iTarget;
  1399   1399     for(i=1; i<pPatch->n; i += jsonNodeSize(&pPatch[i+1])+1){
  1400         -    int nKey;
         1400  +    u32 nKey;
  1401   1401       const char *zKey;
  1402   1402       assert( pPatch[i].eType==JSON_STRING );
  1403   1403       assert( pPatch[i].jnFlags & JNODE_LABEL );
  1404   1404       nKey = pPatch[i].n;
  1405   1405       zKey = pPatch[i].u.zJContent;
  1406   1406       assert( (pPatch[i].jnFlags & JNODE_RAW)==0 );
  1407   1407       for(j=1; j<pTarget->n; j += jsonNodeSize(&pTarget[j+1])+1 ){