/ Check-in [915713ff]
Login

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

Overview
Comment:Fix a bad #endif with the previous check-in on this branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | statvfs
Files: files | file ages | folders
SHA1: 915713ffe4d02ddf1d09a82e39a47b88d3d95ea0
User & Date: drh 2011-12-17 16:25:17
Context
2011-12-17
19:49
Add SQLITE_IOCAP_ZERO_DAMAGE and enable it for both unix and windows. Use this device characteristic to reduce the required work in journaling. A side effect is that this changes the default page exists back to 1024 even with the use of statvfs(). check-in: a0be6ea4 user: drh tags: statvfs
16:25
Fix a bad #endif with the previous check-in on this branch. check-in: 915713ff user: drh tags: statvfs
16:09
Add support for statvfs() in os_unix.c, for determining the sector size. This causes many TCL test failures under Linux. check-in: e0d44450 user: drh tags: statvfs
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/os_unix.c.

3595
3596
3597
3598
3599
3600
3601
3602
3603

3604
3605
3606
3607
3608
3609
3610
    int sz;
    memset(&x, 0, sizeof(x));
    osStatvfs(p->zPath, &x);
    p->szSector = sz = (int)x.f_frsize;
    if( sz<512 || sz>65536 || (sz&(sz-1))!=0 ){
      p->szSector = SQLITE_DEFAULT_SECTOR_SIZE;
    }
  }
#endif

  return p->szSector;
}

/*
** Return the device characteristics for the file. This is always 0 for unix.
*/
static int unixDeviceCharacteristics(sqlite3_file *NotUsed){







<

>







3595
3596
3597
3598
3599
3600
3601

3602
3603
3604
3605
3606
3607
3608
3609
3610
    int sz;
    memset(&x, 0, sizeof(x));
    osStatvfs(p->zPath, &x);
    p->szSector = sz = (int)x.f_frsize;
    if( sz<512 || sz>65536 || (sz&(sz-1))!=0 ){
      p->szSector = SQLITE_DEFAULT_SECTOR_SIZE;
    }

#endif
  }
  return p->szSector;
}

/*
** Return the device characteristics for the file. This is always 0 for unix.
*/
static int unixDeviceCharacteristics(sqlite3_file *NotUsed){