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

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

Issue 2623083002: [sql] Move time-machine support from third_party/sqlite to sql/ (Closed)
Patch Set: scoped-ref in test, too, iwyu pass to remove leftover-from-prototype includes. Created 3 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
« no previous file with comments | « third_party/sqlite/src/main.mk ('k') | third_party/sqlite/src/src/sqliteInt.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/sqlite/src/src/pager.c
diff --git a/third_party/sqlite/src/src/pager.c b/third_party/sqlite/src/src/pager.c
index 74c76f37306e0d0db5763e52cf3a7a82ff65f13e..2c904d2df1f0f5ca08f9566851b5b9a9e319b9de 100644
--- a/third_party/sqlite/src/src/pager.c
+++ b/third_party/sqlite/src/src/pager.c
@@ -5497,20 +5497,6 @@ void sqlite3PagerUnref(DbPage *pPg){
if( pPg ) sqlite3PagerUnrefNotNull(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
@@ -5575,24 +5561,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/src/main.mk ('k') | third_party/sqlite/src/src/sqliteInt.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698