SQLite: Check-in [a18a6ce2]

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

Overview

Comment:	Fix harmless compiler warnings in the 'session' module.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA1:	a18a6ce2271865d04cd75a8a5baa63798b7393db
User & Date:	mistachkin 2016-04-12 19:20:22

Context

2016-04-12
19:30		Compilation fix for a C99-ism in the 'fts3view' tool. (check-in: bedb88a4 user: mistachkin tags: trunk)
19:20		Fix harmless compiler warnings in the 'session' module. (check-in: a18a6ce2 user: mistachkin tags: trunk)
17:13		Fix speedtest1 so that it automatically unlinks its test database prior to startup. (check-in: b65b69f6 user: drh tags: trunk)

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to ext/session/sqlite3session.c.

   931    931     char *zPragma;
   932    932     sqlite3_stmt *pStmt;
   933    933     int rc;
   934    934     int nByte;
   935    935     int nDbCol = 0;
   936    936     int nThis;
   937    937     int i;
   938         -  u8 *pAlloc;
          938  +  u8 *pAlloc = 0;
   939    939     char **azCol = 0;
   940         -  u8 *abPK;
          940  +  u8 *abPK = 0;
   941    941   
   942    942     assert( pazCol && pabPK );
   943    943   
   944    944     nThis = sqlite3Strlen30(zThis);
   945    945     zPragma = sqlite3_mprintf("PRAGMA '%q'.table_info('%q')", zDb, zThis);
   946    946     if( !zPragma ) return SQLITE_NOMEM;
   947    947   
................................................................................
  3651   3651     int eType,                      /* Either CHANGESET_DATA or CONFLICT */
  3652   3652     SessionApplyCtx *p,             /* changeset_apply() context */
  3653   3653     sqlite3_changeset_iter *pIter,  /* Changeset iterator */
  3654   3654     int(*xConflict)(void *, int, sqlite3_changeset_iter*),
  3655   3655     void *pCtx,                     /* First argument for conflict handler */
  3656   3656     int *pbReplace                  /* OUT: Set to true if PK row is found */
  3657   3657   ){
  3658         -  int res;                        /* Value returned by conflict handler */
         3658  +  int res = 0;                    /* Value returned by conflict handler */
  3659   3659     int rc;
  3660   3660     int nCol;
  3661   3661     int op;
  3662   3662     const char *zDummy;
  3663   3663   
  3664   3664     sqlite3changeset_op(pIter, &zDummy, &nCol, &op, 0);
  3665   3665