/ Check-in [12e869bb]
Login

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

Overview
Comment:Fix compiler warnings.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | noWarn
Files: files | file ages | folders
SHA1: 12e869bbac4308f859baf6c6cbf051128b7308ec
User & Date: mistachkin 2015-10-20 23:40:19
Context
2015-10-20
23:40
Fix compiler warnings. Closed-Leaf check-in: 12e869bb user: mistachkin tags: noWarn
23:27
Fix harmless compiler warnings in FTS5. check-in: 0a903ec2 user: mistachkin tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/status.c.

   108    108   }
   109    109   
   110    110   /*
   111    111   ** Adjust the highwater mark if necessary.
   112    112   ** The caller must hold the appropriate mutex.
   113    113   */
   114    114   void sqlite3StatusHighwater(int op, int X){
          115  +#if SQLITE_PTRSIZE>4
          116  +  sqlite3_int64 newValue = (sqlite3_int64)X;
          117  +#else
          118  +  u32 newValue = (u32)X;
          119  +#endif
   115    120     wsdStatInit;
   116    121     assert( op>=0 && op<ArraySize(wsdStat.nowValue) );
   117    122     assert( op>=0 && op<ArraySize(statMutex) );
   118    123     assert( sqlite3_mutex_held(statMutex[op] ? sqlite3Pcache1Mutex()
   119    124                                              : sqlite3MallocMutex()) );
   120    125     assert( op==SQLITE_STATUS_MALLOC_SIZE
   121    126             || op==SQLITE_STATUS_PAGECACHE_SIZE
   122    127             || op==SQLITE_STATUS_SCRATCH_SIZE
   123    128             || op==SQLITE_STATUS_PARSER_STACK );
   124         -  if( X>wsdStat.mxValue[op] ){
   125         -    wsdStat.mxValue[op] = X;
          129  +  if( newValue>wsdStat.mxValue[op] ){
          130  +    wsdStat.mxValue[op] = newValue;
   126    131     }
   127    132   }
   128    133   
   129    134   /*
   130    135   ** Query status information.
   131    136   */
   132    137   int sqlite3_status64(

Changes to src/vdbe.c.

  2366   2366     Mem sMem;          /* For storing the record being decoded */
  2367   2367     const u8 *zData;   /* Part of the record being decoded */
  2368   2368     const u8 *zHdr;    /* Next unparsed byte of the header */
  2369   2369     const u8 *zEndHdr; /* Pointer to first byte after the header */
  2370   2370     u32 offset;        /* Offset into the data */
  2371   2371     u64 offset64;      /* 64-bit offset */
  2372   2372     u32 avail;         /* Number of bytes of available data */
  2373         -  u32 t;             /* A type code from the record header */
         2373  +  u32 t = 0;         /* A type code from the record header */
  2374   2374     u16 fx;            /* pDest->flags value */
  2375   2375     Mem *pReg;         /* PseudoTable input register */
  2376   2376   
  2377   2377     p2 = pOp->p2;
  2378   2378     assert( pOp->p3>0 && pOp->p3<=(p->nMem-p->nCursor) );
  2379   2379     pDest = &aMem[pOp->p3];
  2380   2380     memAboutToChange(p, pDest);