Bug 386179, Stop using sqlite3ApiExit, r=sdwilsh
authorflamingice@sourmilk.net
Tue, 24 Jul 2007 19:18:54 -0700
changeset 3938 63f7b2cba0e307c4c16892b9fd76f23e3c8a1b81
parent 3937 1ee3a01043073b8868b1eca5a4e64a9920146f4b
child 3939 820b532327c538c9452c06a064eba14de9c64c31
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssdwilsh
bugs386179
milestone1.9a7pre
Bug 386179, Stop using sqlite3ApiExit, r=sdwilsh
db/sqlite3/src/sqlite.def
db/sqlite3/src/sqlite3file.h
storage/src/mozStorageAsyncIO.cpp
--- a/db/sqlite3/src/sqlite.def
+++ b/db/sqlite3/src/sqlite.def
@@ -150,10 +150,9 @@ EXPORTS sqlite3_aggregate_context
         sqlite3_value_numeric_type
         sqlite3_value_text
         sqlite3_value_text16
         sqlite3_value_text16be
         sqlite3_value_text16le
         sqlite3_value_type
         sqlite3_version
         sqlite3_vmprintf
-        sqlite3ApiExit               ;needed by mozStorage
         sqlite3Os DATA               ;needed by mozStorage
--- a/db/sqlite3/src/sqlite3file.h
+++ b/db/sqlite3/src/sqlite3file.h
@@ -67,17 +67,16 @@ struct ThreadData;
 #endif
 
 /* FROM sqliteInt.h
 ** ----------------
 ** Call this to check for out of memory errors when returning.
 ** See definition in util.c
 */
 struct sqlite3;
-int sqlite3ApiExit(sqlite3 *db, int);
 
 
 /*
 ** Forward declarations
 */
 typedef struct OsFile OsFile;
 typedef struct IoMethod IoMethod;
 
--- a/storage/src/mozStorageAsyncIO.cpp
+++ b/storage/src/mozStorageAsyncIO.cpp
@@ -1566,19 +1566,16 @@ ProcessAsyncMessages()
         return;
       }
 
       // remove the message from the end of the message queue and release it
       if (message == AsyncQueueLast)
         AsyncQueueLast = nsnull;
       AsyncQueueFirst = message->mNext;
       nsMemory::Free(message);
-
-      // free any out-of-memory flags in the library
-      sqlite3ApiExit(nsnull, 0);
     }
     // Drop the queue mutex before continuing to the next write operation
     // in order to give other threads a chance to work with the write queue
     // (that should have been done by the autolock in exiting the scope that
     // just closed). We want writers to the queue to generally have priority.
     #ifdef IO_DELAY_INTERVAL_MS
       // this simulates slow disk
       PR_Sleep(PR_MillisecondsToInterval(IO_DELAY_INTERVAL_MS));