SQLite: Check-in [cab46fb7]

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

Overview

Comment:	Fix harmless compiler warning.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| msvcWarn
Files:	files \| file ages \| folders
SHA1:	cab46fb737ed3fc29dc8517f07bcfc72936df2b8
User & Date:	mistachkin 2015-01-16 19:35:45

Context

2015-01-17
15:26		Fix a harmless compiler warning the VFS for Windows. check-in: ceac571f user: drh tags: trunk
2015-01-16
19:35		Fix harmless compiler warning. Closed-Leaf check-in: cab46fb7 user: mistachkin tags: msvcWarn
12:08		Version 3.8.8 check-in: 7d68a42f user: drh tags: trunk, release, version-3.8.8

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/os_win.c.

  3810   3810     sqlite3_file *fd,               /* Handle open on database file */
  3811   3811     int iRegion,                    /* Region to retrieve */
  3812   3812     int szRegion,                   /* Size of regions */
  3813   3813     int isWrite,                    /* True to extend file if necessary */
  3814   3814     void volatile **pp              /* OUT: Mapped memory */
  3815   3815   ){
  3816   3816     winFile *pDbFd = (winFile*)fd;
  3817         -  winShm *p = pDbFd->pShm;
         3817  +  winShm *pShm = pDbFd->pShm;
  3818   3818     winShmNode *pShmNode;
  3819   3819     int rc = SQLITE_OK;
  3820   3820   
  3821         -  if( !p ){
         3821  +  if( !pShm ){
  3822   3822       rc = winOpenSharedMemory(pDbFd);
  3823   3823       if( rc!=SQLITE_OK ) return rc;
  3824         -    p = pDbFd->pShm;
         3824  +    pShm = pDbFd->pShm;
  3825   3825     }
  3826         -  pShmNode = p->pShmNode;
         3826  +  pShmNode = pShm->pShmNode;
  3827   3827   
  3828   3828     sqlite3_mutex_enter(pShmNode->mutex);
  3829   3829     assert( szRegion==pShmNode->szRegion || pShmNode->nRegion==0 );
  3830   3830   
  3831   3831     if( pShmNode->nRegion<=iRegion ){
  3832   3832       struct ShmRegion *apNew;           /* New aRegion[] array */
  3833   3833       int nByte = (iRegion+1)*szRegion;  /* Minimum required file size */