diff options
| author | dumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-28 21:58:28 +0000 |
|---|---|---|
| committer | dumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-28 21:58:28 +0000 |
| commit | ee8d4c8656fc8a8723e91e44d05fba4027c77b66 (patch) | |
| tree | 7ed5dd75b40690657edd1e41b1aa78a980fd43d2 /third_party | |
| parent | 0189bc72c90fab03afab623d0b2d8be3d35af3e7 (diff) | |
| download | chromium_src-ee8d4c8656fc8a8723e91e44d05fba4027c77b66.zip chromium_src-ee8d4c8656fc8a8723e91e44d05fba4027c77b66.tar.gz chromium_src-ee8d4c8656fc8a8723e91e44d05fba4027c77b66.tar.bz2 | |
Chromium side patch for DB support on Linux.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/174232
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24807 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/sqlite/README.chromium | 3 | ||||
| -rw-r--r-- | third_party/sqlite/src/os_unix.c | 9 |
2 files changed, 11 insertions, 1 deletions
diff --git a/third_party/sqlite/README.chromium b/third_party/sqlite/README.chromium index 774790a..7daa083 100644 --- a/third_party/sqlite/README.chromium +++ b/third_party/sqlite/README.chromium @@ -106,3 +106,6 @@ Changes from Chrome: - Added a new function chromium_sqlite3_initialize_win_sqlite3_file() at the end of os_win.c. It allows the Windows-specific Chromium VFS to reuse most of the win32 SQLite VFS. + - Added a new function initUnixFile() and made fillInUnixFile() + non-static in os_unix.c. It allows the Linux-specific Chromium VFS + to reuse most of the unix SQLite VFS. diff --git a/third_party/sqlite/src/os_unix.c b/third_party/sqlite/src/os_unix.c index 4874a64..7530ff0 100644 --- a/third_party/sqlite/src/os_unix.c +++ b/third_party/sqlite/src/os_unix.c @@ -2081,6 +2081,13 @@ static int unixDeviceCharacteristics(sqlite3_file *id){ } /* +** Initializes a unixFile structure with zeros. +*/ +void initUnixFile(sqlite3_file* file) { + memset(file, 0, sizeof(unixFile)); +} + +/* ** Initialize the contents of the unixFile structure pointed to by pId. ** ** When locking extensions are enabled, the filepath and locking style @@ -2088,7 +2095,7 @@ static int unixDeviceCharacteristics(sqlite3_file *id){ ** The locking-style specific lockingContext data structure is created ** and assigned here also. */ -static int fillInUnixFile( +int fillInUnixFile( sqlite3_vfs *pVfs, /* Pointer to vfs object */ int h, /* Open file descriptor of file being opened */ int dirfd, /* Directory file descriptor */ |