diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-27 22:01:58 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-27 22:01:58 +0000 |
| commit | c525312fcba05ce1b6de26586e83f173f90a89c4 (patch) | |
| tree | d0185bdaddfc57e06ea6565a5283fa2ba9ed8073 /base/base64.cc | |
| parent | c0716012e40ccbcac067205edcb9ad7b76507296 (diff) | |
| download | chromium_src-c525312fcba05ce1b6de26586e83f173f90a89c4.zip chromium_src-c525312fcba05ce1b6de26586e83f173f90a89c4.tar.gz chromium_src-c525312fcba05ce1b6de26586e83f173f90a89c4.tar.bz2 | |
Make modp_b64 and base::base64 compile on Win64
BUG=166496
Review URL: https://chromiumcodereview.appspot.com/11688006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174700 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base64.cc')
| -rw-r--r-- | base/base64.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/base/base64.cc b/base/base64.cc index 1907978..9514b0a 100644 --- a/base/base64.cc +++ b/base/base64.cc @@ -16,8 +16,8 @@ bool Base64Encode(const StringPiece& input, std::string* output) { int input_size = static_cast<int>(input.size()); // modp_b64_encode_len() returns at least 1, so temp[0] is safe to use. - int output_size = modp_b64_encode(&(temp[0]), input.data(), input_size); - if (output_size < 0) + size_t output_size = modp_b64_encode(&(temp[0]), input.data(), input_size); + if (output_size == MODP_B64_ERROR) return false; temp.resize(output_size); // strips off null byte @@ -30,9 +30,9 @@ bool Base64Decode(const StringPiece& input, std::string* output) { temp.resize(modp_b64_decode_len(input.size())); // does not null terminate result since result is binary data! - int input_size = static_cast<int>(input.size()); - int output_size = modp_b64_decode(&(temp[0]), input.data(), input_size); - if (output_size < 0) + size_t input_size = input.size(); + size_t output_size = modp_b64_decode(&(temp[0]), input.data(), input_size); + if (output_size == MODP_B64_ERROR) return false; temp.resize(output_size); |