[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[evan at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 4460b5899fda7769b450e356d4b5a02d6c0ded02
Author: evan at chromium.org <evan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 20 01:08:08 2010 +0000

    2010-10-19  Evan Martin  <evan at chromium.org>
    
            Reviewed by Tony Chang.
    
            sqlite: remove unused member variable
            https://bugs.webkit.org/show_bug.cgi?id=47957
    
            There's no need to save the error code into a member variable
            because nobody ever looks at it.
    
            * platform/sql/SQLiteDatabase.cpp:
            (WebCore::SQLiteDatabase::open):
            * platform/sql/SQLiteDatabase.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70114 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 19c338f..9909880 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-19  Evan Martin  <evan at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        sqlite: remove unused member variable
+        https://bugs.webkit.org/show_bug.cgi?id=47957
+
+        There's no need to save the error code into a member variable
+        because nobody ever looks at it.
+
+        * platform/sql/SQLiteDatabase.cpp:
+        (WebCore::SQLiteDatabase::open):
+        * platform/sql/SQLiteDatabase.h:
+
 2010-10-19  Jia Pu  <jpu at apple.com>
 
         Reviewed by James Robinson.
diff --git a/WebCore/platform/sql/SQLiteDatabase.cpp b/WebCore/platform/sql/SQLiteDatabase.cpp
index ae963bb..b9e7639 100644
--- a/WebCore/platform/sql/SQLiteDatabase.cpp
+++ b/WebCore/platform/sql/SQLiteDatabase.cpp
@@ -65,8 +65,7 @@ bool SQLiteDatabase::open(const String& filename, bool forWebSQLDatabase)
 {
     close();
 
-    m_lastError = SQLiteFileSystem::openDatabase(filename, &m_db, forWebSQLDatabase);
-    if (m_lastError != SQLITE_OK) {
+    if (SQLiteFileSystem::openDatabase(filename, &m_db, forWebSQLDatabase) != SQLITE_OK) {
         LOG_ERROR("SQLite database failed to load from %s\nCause - %s", filename.ascii().data(),
             sqlite3_errmsg(m_db));
         sqlite3_close(m_db);
diff --git a/WebCore/platform/sql/SQLiteDatabase.h b/WebCore/platform/sql/SQLiteDatabase.h
index 8151380..c329273 100644
--- a/WebCore/platform/sql/SQLiteDatabase.h
+++ b/WebCore/platform/sql/SQLiteDatabase.h
@@ -139,7 +139,6 @@ private:
     int pageSize();
     
     sqlite3* m_db;
-    int m_lastError;
     int m_pageSize;
     
     bool m_transactionInProgress;

-- 
WebKit Debian packaging