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

Unified Diff: chromeos/printing/printer_translator.cc

Issue 2232573002: Fix uninitialized fields in Printer::PPDFile. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | « chromeos/printing/printer_configuration.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/printing/printer_translator.cc
diff --git a/chromeos/printing/printer_translator.cc b/chromeos/printing/printer_translator.cc
index a28e5766f6daa6ce4564047827774be6f5a7cc49..419f29d0b7600411571ec06a4b9f7a62afa385ec 100644
--- a/chromeos/printing/printer_translator.cc
+++ b/chromeos/printing/printer_translator.cc
@@ -37,22 +37,12 @@ const char kUUID[] = "uuid";
std::unique_ptr<Printer::PPDFile> DictionaryToPPDFile(
const base::DictionaryValue* value) {
std::unique_ptr<Printer::PPDFile> ppd = base::MakeUnique<Printer::PPDFile>();
- int id = -1;
- value->GetInteger(kPPDid, &id);
- ppd->id = id;
-
- std::string file_name;
- if (value->GetString(kFileName, &file_name))
- ppd->file_name = file_name;
-
- int version_number = 0;
- if (value->GetInteger(kVersionNumber, &version_number))
- ppd->version_number = version_number;
-
- bool from_quirks;
- if (value->GetBoolean(kFromQuirks, &from_quirks))
- ppd->from_quirks_server = from_quirks;
-
+ // struct PPDFile defines default values for these fields so there is no need
+ // to check return values.
+ value->GetInteger(kPPDid, &ppd->id);
+ value->GetString(kFileName, &ppd->file_name);
+ value->GetInteger(kVersionNumber, &ppd->version_number);
+ value->GetBoolean(kFromQuirks, &ppd->from_quirks_server);
return ppd;
}
« no previous file with comments | « chromeos/printing/printer_configuration.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698