/ Check-in [d7d4a94f]
Login

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

Overview
Comment:Do not embedded #if inside an assert() statement. Fix for check-in [dca8763872a]
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:d7d4a94fc1209fd32d7c8e20ac83eb169b81ee25
User & Date: drh 2010-10-05 18:22:48
Context
2010-10-06
09:57
Fix a bug in test code that was causing a valgrind error. No changes to production code. check-in: f29da7be user: dan tags: trunk
2010-10-05
18:22
Do not embedded #if inside an assert() statement. Fix for check-in [dca8763872a] check-in: d7d4a94f user: drh tags: trunk
17:02
Have the pager change to at least WRITER_CACHEMOD state before marking any pages as dirty (instead of immediately after). Otherwise, if an error occurs, the pager may be left in WRITER_LOCKED state with dirty pages in the cache. check-in: 471a4efb user: dan tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/os_unix.c.

  4077   4077     */
  4078   4078     UNUSED_PARAMETER(isDelete);
  4079   4079   
  4080   4080     /* Usually the path zFilename should not be a relative pathname. The
  4081   4081     ** exception is when opening the proxy "conch" file in builds that
  4082   4082     ** include the special Apple locking styles.
  4083   4083     */
  4084         -  assert( zFilename==0 || zFilename[0]=='/' 
  4085   4084   #if defined(__APPLE__) && SQLITE_ENABLE_LOCKING_STYLE
  4086         -    || pVfs->pAppData==(void*)&autolockIoFinder
         4085  +  assert( zFilename==0 || zFilename[0]=='/' 
         4086  +    || pVfs->pAppData==(void*)&autolockIoFinder );
         4087  +#else
         4088  +  assert( zFilename==0 || zFilename[0]=='/' );
  4087   4089   #endif
  4088         -  );
  4089   4090   
  4090   4091     OSTRACE(("OPEN    %-3d %s\n", h, zFilename));
  4091   4092     pNew->h = h;
  4092   4093     pNew->dirfd = dirfd;
  4093   4094     pNew->fileFlags = 0;
  4094   4095     pNew->zPath = zFilename;
  4095   4096