summaryrefslogtreecommitdiffstats
path: root/extensions/cookie/nsPermissionManager.cpp
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-09-29 23:20:36 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-09-29 23:20:36 +0200
commit81b341a9b37acae2b60e0334a9b0846bc5be8445 (patch)
treeb998e480ac1971ea93101510438ba1e87d9db82a /extensions/cookie/nsPermissionManager.cpp
parentddf29811b2d95bdf8385b9eb85519332b69344ca (diff)
downloadUXP-81b341a9b37acae2b60e0334a9b0846bc5be8445.tar
UXP-81b341a9b37acae2b60e0334a9b0846bc5be8445.tar.gz
UXP-81b341a9b37acae2b60e0334a9b0846bc5be8445.tar.lz
UXP-81b341a9b37acae2b60e0334a9b0846bc5be8445.tar.xz
UXP-81b341a9b37acae2b60e0334a9b0846bc5be8445.zip
Clean up a number of unused variables.
Tag #21.
Diffstat (limited to 'extensions/cookie/nsPermissionManager.cpp')
-rw-r--r--extensions/cookie/nsPermissionManager.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/extensions/cookie/nsPermissionManager.cpp b/extensions/cookie/nsPermissionManager.cpp
index 13ae7fd35..2c2e2d79c 100644
--- a/extensions/cookie/nsPermissionManager.cpp
+++ b/extensions/cookie/nsPermissionManager.cpp
@@ -1076,8 +1076,6 @@ nsPermissionManager::InitDB(bool aRemoveFile)
bool hostsTableExists = false;
mDBConn->TableExists(NS_LITERAL_CSTRING("moz_hosts"), &hostsTableExists);
if (hostsTableExists) {
- bool migrationError = false;
-
// Both versions 4 and 6 have a version 4 formatted hosts table named
// moz_hosts. We can migrate this table to our version 7 table moz_perms.
// If moz_perms is present, then we can use it as a basis for comparison.
@@ -1125,12 +1123,10 @@ nsPermissionManager::InitDB(bool aRemoveFile)
// Read in the old row
rv = stmt->GetUTF8String(0, host);
if (NS_WARN_IF(NS_FAILED(rv))) {
- migrationError = true;
continue;
}
rv = stmt->GetUTF8String(1, type);
if (NS_WARN_IF(NS_FAILED(rv))) {
- migrationError = true;
continue;
}
permission = stmt->AsInt32(2);
@@ -1138,7 +1134,6 @@ nsPermissionManager::InitDB(bool aRemoveFile)
expireTime = stmt->AsInt64(4);
modificationTime = stmt->AsInt64(5);
if (NS_WARN_IF(stmt->AsInt64(6) < 0)) {
- migrationError = true;
continue;
}
appId = static_cast<uint32_t>(stmt->AsInt64(6));
@@ -1155,7 +1150,6 @@ nsPermissionManager::InitDB(bool aRemoveFile)
if (NS_FAILED(rv)) {
NS_WARNING("Unexpected failure when upgrading migrating permission "
"from host to origin");
- migrationError = true;
}
}