zorba-coders team mailing list archive
-
zorba-coders team
-
Mailing list archive
-
Message #24632
[Merge] lp:~zorba-coders/zorba/new-base64-api-archive into lp:zorba/archive-module
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/new-base64-api-archive into lp:zorba/archive-module.
Commit message:
New Base64 API.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-archive/+merge/177949
New Base64 API.
--
https://code.launchpad.net/~zorba-coders/zorba/new-base64-api-archive/+merge/177949
Your team Zorba Coders is subscribed to branch lp:zorba/archive-module.
=== modified file 'src/archive_module.xq.src/archive_module.cpp'
--- src/archive_module.xq.src/archive_module.cpp 2013-07-29 19:24:56 +0000
+++ src/archive_module.xq.src/archive_module.cpp 2013-07-31 22:03:24 +0000
@@ -530,10 +530,7 @@
if (aFile.isEncoded())
{
- zorba::String lEncoded(lBinValue, lResFileSize);
- zorba::String lDecoded = zorba::base64::decode(lEncoded);
- lStream->write(lDecoded.c_str(), lDecoded.length());
- aResFileSize = lDecoded.size();
+ aResFileSize = zorba::base64::decode(lBinValue, lResFileSize, *lStream);
}
else
{
@@ -967,8 +964,7 @@
if (theArchiveItem.isEncoded())
{
- zorba::String lEncoded(lData, lLen);
- theDecodedData = base64::decode(lEncoded);
+ base64::decode(lData, lLen, &theDecodedData);
lLen = theDecodedData.size();
lErr = archive_read_open_memory(theArchive,
const_cast<char*>(theDecodedData.c_str()), lLen);
Follow ups