/ Check-in [a2908e2c]
Login

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

Overview
Comment:Cleanup superfluous whitespace changes.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | readonly-wal-recovery
Files: files | file ages | folders
SHA3-256: a2908e2c88f7a30638a7e791fc7ad0325b663097c12cecd1f4726b0d60a9a3ed
User & Date: mistachkin 2017-11-09 22:25:58
Context
2017-11-09
23:24
Avoid superfluous SHM unlock call in the Win32 VFS. check-in: 5a384be6 user: mistachkin tags: readonly-wal-recovery
22:25
Cleanup superfluous whitespace changes. check-in: a2908e2c user: mistachkin tags: readonly-wal-recovery
22:23
Revise and vastly simplify the Win32 SHM file locking semantics, allowing all new tests to pass. check-in: d0997b0f user: mistachkin tags: readonly-wal-recovery
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/os_win.c.

  3854   3854   ** Open the shared-memory area associated with database file pDbFd.
  3855   3855   **
  3856   3856   ** When opening a new shared-memory file, if no other instances of that
  3857   3857   ** file are currently open, in this process or in other processes, then
  3858   3858   ** the file must be truncated to zero length or have its header cleared.
  3859   3859   */
  3860   3860   static int winOpenSharedMemory(winFile *pDbFd){
  3861         -  struct winShm *p;         /* The connection to be opened */
  3862         -  winShmNode *pShmNode = 0; /* The underlying mmapped file */
  3863         -  int rc = SQLITE_OK;       /* Result code */
  3864         -  int rc2 = SQLITE_ERROR;   /* winOpen result code */
  3865         -  winShmNode *pNew;         /* Newly allocated winShmNode */
  3866         -  int nName;                /* Size of zName in bytes */
         3861  +  struct winShm *p;                  /* The connection to be opened */
         3862  +  winShmNode *pShmNode = 0;          /* The underlying mmapped file */
         3863  +  int rc = SQLITE_OK;                /* Result code */
         3864  +  int rc2 = SQLITE_ERROR;            /* winOpen result code */
         3865  +  winShmNode *pNew;                  /* Newly allocated winShmNode */
         3866  +  int nName;                         /* Size of zName in bytes */
  3867   3867   
  3868   3868     assert( pDbFd->pShm==0 );    /* Not previously opened */
  3869   3869   
  3870   3870     /* Allocate space for the new sqlite3_shm object.  Also speculatively
  3871   3871     ** allocate space for a new winShmNode and filename.
  3872   3872     */
  3873   3873     p = sqlite3MallocZero( sizeof(*p) );