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

Side by Side Diff: net/base/net_string_util_icu.cc

Issue 1223983002: Move WriteInto to base namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 unified diff | Download patch
« no previous file with comments | « net/android/keystore_unittest.cc ('k') | net/cert/crl_set_storage.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/base/net_string_util.h" 5 #include "net/base/net_string_util.h"
6 6
7 #include "base/i18n/i18n_constants.h" 7 #include "base/i18n/i18n_constants.h"
8 #include "base/i18n/icu_string_conversions.h" 8 #include "base/i18n/icu_string_conversions.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "third_party/icu/source/common/unicode/ucnv.h" 10 #include "third_party/icu/source/common/unicode/ucnv.h"
11 11
12 namespace net { 12 namespace net {
13 13
14 const char* const kCharsetLatin1 = base::kCodepageLatin1; 14 const char* const kCharsetLatin1 = base::kCodepageLatin1;
15 15
16 bool ConvertToUtf8(const std::string& text, const char* charset, 16 bool ConvertToUtf8(const std::string& text, const char* charset,
17 std::string* output) { 17 std::string* output) {
18 output->clear(); 18 output->clear();
19 19
20 UErrorCode err = U_ZERO_ERROR; 20 UErrorCode err = U_ZERO_ERROR;
21 UConverter* converter(ucnv_open(charset, &err)); 21 UConverter* converter(ucnv_open(charset, &err));
22 if (U_FAILURE(err)) 22 if (U_FAILURE(err))
23 return false; 23 return false;
24 24
25 // A single byte in a legacy encoding can be expanded to 3 bytes in UTF-8. 25 // A single byte in a legacy encoding can be expanded to 3 bytes in UTF-8.
26 // A 'two-byte character' in a legacy encoding can be expanded to 4 bytes 26 // A 'two-byte character' in a legacy encoding can be expanded to 4 bytes
27 // in UTF-8. Therefore, the expansion ratio is 3 at most. Add one for a 27 // in UTF-8. Therefore, the expansion ratio is 3 at most. Add one for a
28 // trailing '\0'. 28 // trailing '\0'.
29 size_t output_length = text.length() * 3 + 1; 29 size_t output_length = text.length() * 3 + 1;
30 char* buf = WriteInto(output, output_length); 30 char* buf = base::WriteInto(output, output_length);
31 output_length = ucnv_toAlgorithmic(UCNV_UTF8, converter, buf, output_length, 31 output_length = ucnv_toAlgorithmic(UCNV_UTF8, converter, buf, output_length,
32 text.data(), text.length(), &err); 32 text.data(), text.length(), &err);
33 ucnv_close(converter); 33 ucnv_close(converter);
34 if (U_FAILURE(err)) { 34 if (U_FAILURE(err)) {
35 output->clear(); 35 output->clear();
36 return false; 36 return false;
37 } 37 }
38 38
39 output->resize(output_length); 39 output->resize(output_length);
40 return true; 40 return true;
(...skipping 12 matching lines...) Expand all
53 53
54 bool ConvertToUTF16WithSubstitutions(const std::string& text, 54 bool ConvertToUTF16WithSubstitutions(const std::string& text,
55 const char* charset, 55 const char* charset,
56 base::string16* output) { 56 base::string16* output) {
57 return base::CodepageToUTF16(text, charset, 57 return base::CodepageToUTF16(text, charset,
58 base::OnStringConversionError::SUBSTITUTE, 58 base::OnStringConversionError::SUBSTITUTE,
59 output); 59 output);
60 } 60 }
61 61
62 } // namespace net 62 } // namespace net
OLDNEW
« no previous file with comments | « net/android/keystore_unittest.cc ('k') | net/cert/crl_set_storage.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698