SQLite: Check-in [274d2a22]

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

Overview

Comment:	Fix harmless compiler warnings coming from MSVC64 in test code. No changes to the core.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA1:	274d2a22660c7b34b8bbd85f3c29cbafbcb1b4e7
User & Date:	drh 2013-03-27 20:41:15

Context

2013-03-28
11:40		Adjustment to an extreme corner case in the sqlite3Atoi64() routine. check-in: 39534b4b user: drh tags: trunk
01:19		Merge the changes for the 3.7.16.1 release candidate into the sessions branch. check-in: ee35a897 user: drh tags: sessions
2013-03-27
20:41		Fix harmless compiler warnings coming from MSVC64 in test code. No changes to the core. check-in: 274d2a22 user: drh tags: trunk
19:46		Increment the version number to 3.7.16.1. check-in: 7e32eb7b user: drh tags: trunk

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/test_fs.c.

    95     95   
    96     96     if( argc!=4 ){
    97     97       *pzErr = sqlite3_mprintf("wrong number of arguments");
    98     98       return SQLITE_ERROR;
    99     99     }
   100    100     zTbl = argv[3];
   101    101   
   102         -  nByte = sizeof(fs_vtab) + strlen(zTbl) + 1 + strlen(zDb) + 1;
          102  +  nByte = sizeof(fs_vtab) + (int)strlen(zTbl) + 1 + (int)strlen(zDb) + 1;
   103    103     pVtab = (fs_vtab *)sqlite3MallocZero( nByte );
   104    104     if( !pVtab ) return SQLITE_NOMEM;
   105    105   
   106    106     pVtab->zTbl = (char *)&pVtab[1];
   107    107     pVtab->zDb = &pVtab->zTbl[strlen(zTbl)+1];
   108    108     pVtab->db = db;
   109    109     memcpy(pVtab->zTbl, zTbl, strlen(zTbl));

Changes to src/test_regexp.c.

   184    184     int c = RE_EOF+1;
   185    185     int cPrev = 0;
   186    186     int rc = 0;
   187    187     ReInput in;
   188    188   
   189    189     in.z = zIn;
   190    190     in.i = 0;
   191         -  in.mx = nIn>=0 ? nIn : strlen((char const*)zIn);
          191  +  in.mx = nIn>=0 ? nIn : (int)strlen((char const*)zIn);
   192    192   
   193    193     /* Look for the initial prefix match, if there is one. */
   194    194     if( pRe->nInit ){
   195    195       unsigned char x = pRe->zInit[0];
   196    196       while( in.i+pRe->nInit<=in.mx 
   197    197        && (zIn[in.i]!=x ||
   198    198            strncmp((const char*)zIn+in.i, (const char*)pRe->zInit, pRe->nInit)!=0)
................................................................................
   624    624     if( zIn[0]=='^' ){
   625    625       zIn++;
   626    626     }else{
   627    627       re_append(pRe, RE_OP_ANYSTAR, 0);
   628    628     }
   629    629     pRe->sIn.z = (unsigned char*)zIn;
   630    630     pRe->sIn.i = 0;
   631         -  pRe->sIn.mx = strlen(zIn);
          631  +  pRe->sIn.mx = (int)strlen(zIn);
   632    632     zErr = re_subcompile_re(pRe);
   633    633     if( zErr ){
   634    634       re_free(pRe);
   635    635       return zErr;
   636    636     }
   637    637     if( rePeek(pRe)=='$' && pRe->sIn.i+1>=pRe->sIn.mx ){
   638    638       re_append(pRe, RE_OP_MATCH, RE_EOF);