chrome/browser/importer/nss_decryptor.cc - Issue 9365030: More SQL statement usage regularization. Back-touch some

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/importer/nss_decryptor.cc

Issue 9365030: More SQL statement usage regularization. Back-touch some (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix log messages Created 8 years, 10 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:

Index: chrome/browser/importer/nss_decryptor.cc

diff --git a/chrome/browser/importer/nss_decryptor.cc b/chrome/browser/importer/nss_decryptor.cc

index 1658e35545c2bb7c0c15c1122457fc2f4a251214..5fef1ee2768fb95cc40725a2a6f840623595c8a4 100644

--- a/chrome/browser/importer/nss_decryptor.cc

+++ b/chrome/browser/importer/nss_decryptor.cc

@@ -240,7 +240,7 @@ bool NSSDecryptor::ReadAndParseSignons(const FilePath& sqlite_file,

const char* query = "SELECT hostname FROM moz_disabledHosts";

sql::Statement s(db.GetUniqueStatement(query));

- if (!s)

+ if (!s.is_valid())

return false;

GURL::Replacements rep;

@@ -262,7 +262,7 @@ bool NSSDecryptor::ReadAndParseSignons(const FilePath& sqlite_file,

"encryptedPassword FROM moz_logins";

sql::Statement s2(db.GetUniqueStatement(query2));

- if (!s2)

+ if (!s2.is_valid())

return false;

while (s2.Step()) {