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

Unified Diff: base/base64.cc

Issue 11688006: Make modp_b64 and base::base64 compile on Win64 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years 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 | « no previous file | third_party/modp_b64/README.chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base64.cc
===================================================================
--- base/base64.cc (revision 174668)
+++ base/base64.cc (working copy)
@@ -16,8 +16,8 @@
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 @@
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);
« no previous file with comments | « no previous file | third_party/modp_b64/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698