Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(764)

Unified Diff: third_party/sqlite/sqlite-src-3070603/src/pager.c

Issue 826543003: [sql] Import reference version of SQLite 3.7.6.3. (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: gitignore forgot some files for me. Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/sqlite/sqlite-src-3070603/src/pager.c
diff --git a/third_party/sqlite/src/src/pager.c b/third_party/sqlite/sqlite-src-3070603/src/pager.c
similarity index 99%
copy from third_party/sqlite/src/src/pager.c
copy to third_party/sqlite/sqlite-src-3070603/src/pager.c
index a4fe31869376f59978bf7d9c5a90ed7db8409576..e6d1cdebf1007a087e41ff418336f9160de5f4d9 100644
--- a/third_party/sqlite/src/src/pager.c
+++ b/third_party/sqlite/sqlite-src-3070603/src/pager.c
@@ -5093,20 +5093,6 @@ void sqlite3PagerUnref(DbPage *pPg){
}
}
-#if defined(__APPLE__)
-/*
-** Create and return a CFURLRef given a cstring containing the path to a file.
-*/
-static CFURLRef create_cfurl_from_cstring(const char* filePath){
- CFStringRef urlString = CFStringCreateWithFileSystemRepresentation(
- kCFAllocatorDefault, filePath);
- CFURLRef urlRef = CFURLCreateWithFileSystemPath(kCFAllocatorDefault,
- urlString, kCFURLPOSIXPathStyle, FALSE);
- CFRelease(urlString);
- return urlRef;
-}
-#endif
-
/*
** This function is called at the start of every write transaction.
** There must already be a RESERVED or EXCLUSIVE lock on the database
@@ -5166,24 +5152,6 @@ static int pager_open_journal(Pager *pPager){
#else
rc = sqlite3OsOpen(pVfs, pPager->zJournal, pPager->jfd, flags, 0);
#endif
-#if defined(__APPLE__)
- /* Set the TimeMachine exclusion metadata for the journal if it has
- ** been set for the database. Only do this for unix-type vfs
- ** implementations. */
- if( rc==SQLITE_OK && pPager->zFilename!=NULL
- && strlen(pPager->zFilename)>0
- && strncmp(pVfs->zName, "unix", 4)==0
- && ( pVfs->zName[4]=='-' || pVfs->zName[4]=='\0' ) ){
- CFURLRef database = create_cfurl_from_cstring(pPager->zFilename);
- if( CSBackupIsItemExcluded(database, NULL) ){
- CFURLRef journal = create_cfurl_from_cstring(pPager->zJournal);
- /* Ignore errors from the following exclusion call. */
- CSBackupSetItemExcluded(journal, TRUE, FALSE);
- CFRelease(journal);
- }
- CFRelease(database);
- }
-#endif
}
assert( rc!=SQLITE_OK || isOpen(pPager->jfd) );
}
« no previous file with comments | « third_party/sqlite/sqlite-src-3070603/src/pager.h ('k') | third_party/sqlite/sqlite-src-3070603/src/parse.y » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698