/ Check-in [bba1bfbd]
Login
Overview
Comment:Attempt to fix a harmless compiler warning from Clang.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256:bba1bfbde62733e14f458bf3b71cb00d4899a4ebae2553d6ed24d48495cdced1
User & Date: drh 2018-03-09 12:46:34
Context
2018-03-09
14:06
Fix a test case in zipfilefault.test so that it only runs if JSON1 is available. check-in: 072b2447 user: drh tags: trunk
12:46
Attempt to fix a harmless compiler warning from Clang. check-in: bba1bfbd user: drh tags: trunk
2018-03-08
19:56
Enable API armor handling for the new deserialize APIs. check-in: 0798c91a user: mistachkin tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to ext/misc/zipfile.c.

1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
      default: goto parse_error;
    }
    for(i=1; i<10; i++){
      if( z[i]==zTemplate[i] ) mode |= 1 << (9-i);
      else if( z[i]!='-' ) goto parse_error;
    }
  }
  if( (bIsDir == ((mode & S_IFDIR)==0)) ){
    /* The "mode" attribute is a directory, but data has been specified.
    ** Or vice-versa - no data but "mode" is a file or symlink.  */
    return SQLITE_CONSTRAINT;
  }
  *pMode = mode;
  return SQLITE_OK;








|







1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
      default: goto parse_error;
    }
    for(i=1; i<10; i++){
      if( z[i]==zTemplate[i] ) mode |= 1 << (9-i);
      else if( z[i]!='-' ) goto parse_error;
    }
  }
  if( ((mode & S_IFDIR)==0)==bIsDir ){
    /* The "mode" attribute is a directory, but data has been specified.
    ** Or vice-versa - no data but "mode" is a file or symlink.  */
    return SQLITE_CONSTRAINT;
  }
  *pMode = mode;
  return SQLITE_OK;