The comment in base64.h implies that base::Base64Encode() can return false, but

this cannot happen in practice. Fix the comment.

The implementation of Base64Encode() attempts to check for the return value
MODP_B64_ERROR as a failure, but modp_b64_encode() cannot return this
value. Remove the check.

Remove unneeded integer cast.

Change the return type to void.

BUG=323357
TEST=base_unittests, compile all
TBR=jochen@chromium.org,miket@chromium.org,joi@chromium.org,akalin@chromium.org,sergeyu@chromium.org

Review URL: https://codereview.chromium.org/86913002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239759 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 8 deletions

diff --git a/base/base64.cc b/base/base64.cc
index 9514b0a..8ed1249 100644
--- a/base/base64.cc
+++ b/base/base64.cc
@@ -8,21 +8,15 @@
 
 namespace base {
 
-bool Base64Encode(const StringPiece& input, std::string* output) {
+void Base64Encode(const StringPiece& input, std::string* output) {
   std::string temp;
   temp.resize(modp_b64_encode_len(input.size()));  // makes room for null byte
 
-  // null terminates result since result is base64 text!
-  int input_size = static_cast<int>(input.size());
-
   // modp_b64_encode_len() returns at least 1, so temp[0] is safe to use.
-  size_t output_size = modp_b64_encode(&(temp[0]), input.data(), input_size);
-  if (output_size == MODP_B64_ERROR)
-    return false;
+  size_t output_size = modp_b64_encode(&(temp[0]), input.data(), input.size());
 
   temp.resize(output_size);  // strips off null byte
   output->swap(temp);
-  return true;
 }
 
 bool Base64Decode(const StringPiece& input, std::string* output) {