diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-07 16:12:06 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-07 16:12:06 +0000 |
| commit | 3030374e345652de06eecbf954d8b0e212c16f56 (patch) | |
| tree | 42e28456b62d0abc668d8e8bff52f9a431942a31 /chromeos | |
| parent | 7e29ff1b73c7be6c2716b87374f1c2aae4ab2bf5 (diff) | |
| download | chromium_src-3030374e345652de06eecbf954d8b0e212c16f56.zip chromium_src-3030374e345652de06eecbf954d8b0e212c16f56.tar.gz chromium_src-3030374e345652de06eecbf954d8b0e212c16f56.tar.bz2 | |
Remove redundant mapping of net errors to strings.
The new list does not have the leading "net::ERR_", to slightly reduce
the size of net when compiled. This reduces the size of libcronet.so
by about 8k, with symbols stripped.
Also add a function to get network error strings without the leading,
"net::" as a number of consumers were removing it with duplicated code.
This CL slight breaks NetLog loading functionality - loading old logs
in new versions will result in error codes missing the leading "ERR_",
and the other direction results in error codes having an extra leading
"ERR_".
BUG=399025
Review URL: https://codereview.chromium.org/432553003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288065 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/network/onc/onc_certificate_importer_impl.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chromeos/network/onc/onc_certificate_importer_impl.cc b/chromeos/network/onc/onc_certificate_importer_impl.cc index 13e4880..7bb1833 100644 --- a/chromeos/network/onc/onc_certificate_importer_impl.cc +++ b/chromeos/network/onc/onc_certificate_importer_impl.cc @@ -278,9 +278,10 @@ bool CertificateImporterImpl::ParseServerOrCaCertificate( success = target_nssdb_->ImportCACerts(cert_list, trust, &failures); if (!failures.empty()) { + std::string error_string = net::ErrorToString(failures[0].net_error); ONC_LOG_ERROR( base::StringPrintf("Error ( %s ) importing %s certificate", - net::ErrorToString(failures[0].net_error), + error_string.c_str(), cert_type.c_str())); return false; } @@ -329,9 +330,10 @@ bool CertificateImporterImpl::ParseClientCertificate( int import_result = target_nssdb_->ImportFromPKCS12( module.get(), decoded_pkcs12, base::string16(), false, &imported_certs); if (import_result != net::OK) { + std::string error_string = net::ErrorToString(import_result); ONC_LOG_ERROR( base::StringPrintf("Unable to import client certificate (error %s)", - net::ErrorToString(import_result))); + error_string.c_str())); return false; } |