/ Check-in [dca87638]
Login

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

Overview
Comment:Fix an assert() failing on OSX.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: dca8763872aa6244cb1a0f519167b360a6372d0d
User & Date: dan 2010-10-05 11:33:15
References
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
Context
2010-10-05
12:05
Avoid all memory allocation (and hence the possiblitity of OOM failure) in sqlite3_value_double() and sqlite3_column_double(). check-in: 4afdf970 user: drh tags: trunk
11:33
Fix an assert() failing on OSX. check-in: dca87638 user: dan tags: trunk
08:13
Prevent backcompat.test from mistaking directories for binary executables. check-in: 717a1e50 user: dan tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/os_unix.c.

4072
4073
4074
4075
4076
4077
4078










4079
4080
4081
4082
4083
4084
4085
4086
4087
4088
4089
4090
4091

  assert( pNew->pInode==NULL );

  /* Parameter isDelete is only used on vxworks. Express this explicitly 
  ** here to prevent compiler warnings about unused parameters.
  */
  UNUSED_PARAMETER(isDelete);











  OSTRACE(("OPEN    %-3d %s\n", h, zFilename));
  pNew->h = h;
  pNew->dirfd = dirfd;
  pNew->fileFlags = 0;
  assert( zFilename==0 || zFilename[0]=='/' );  /* Never a relative pathname */
  pNew->zPath = zFilename;

#if OS_VXWORKS
  pNew->pId = vxworksFindFileId(zFilename);
  if( pNew->pId==0 ){
    noLock = 1;
    rc = SQLITE_NOMEM;







>
>
>
>
>
>
>
>
>
>





<







4072
4073
4074
4075
4076
4077
4078
4079
4080
4081
4082
4083
4084
4085
4086
4087
4088
4089
4090
4091
4092
4093

4094
4095
4096
4097
4098
4099
4100

  assert( pNew->pInode==NULL );

  /* Parameter isDelete is only used on vxworks. Express this explicitly 
  ** here to prevent compiler warnings about unused parameters.
  */
  UNUSED_PARAMETER(isDelete);

  /* Usually the path zFilename should not be a relative pathname. The
  ** exception is when opening the proxy "conch" file in builds that
  ** include the special Apple locking styles.
  */
  assert( zFilename==0 || zFilename[0]=='/' 
#if defined(__APPLE__) && SQLITE_ENABLE_LOCKING_STYLE
    || pVfs->pAppData==(void*)&autolockIoFinder
#endif
  );

  OSTRACE(("OPEN    %-3d %s\n", h, zFilename));
  pNew->h = h;
  pNew->dirfd = dirfd;
  pNew->fileFlags = 0;

  pNew->zPath = zFilename;

#if OS_VXWORKS
  pNew->pId = vxworksFindFileId(zFilename);
  if( pNew->pId==0 ){
    noLock = 1;
    rc = SQLITE_NOMEM;