GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed type for maximum line length.

Browse Source
This commit is contained in:
Vincent Richard 2012-12-22 13:40:18 +01:00
parent 0305c3c5a9
commit 9e8cdca585
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/utility/encoder/b64Encoder.cpp
View File

@ -80,10 +80,11 @@ utility::stream::size_type b64Encoder::encode(utility::inputStream& in,
{ {
in.reset(); // may not work... in.reset(); // may not work...
const int propMaxLineLength = getProperties().getProperty <int>("maxlinelength", -1); const string::size_type propMaxLineLength =
getProperties().getProperty <string::size_type>("maxlinelength", static_cast <string::size_type>(-1));
const bool cutLines = (propMaxLineLength != -1); const bool cutLines = (propMaxLineLength != static_cast <string::size_type>(-1));
const int maxLineLength = std::min(propMaxLineLength, 76); const string::size_type maxLineLength = std::min(propMaxLineLength, static_cast <string::size_type>(76));
// Process data // Process data
utility::stream::value_type buffer[65536]; utility::stream::value_type buffer[65536];
@ -96,7 +97,7 @@ utility::stream::size_type b64Encoder::encode(utility::inputStream& in,
utility::stream::size_type total = 0; utility::stream::size_type total = 0;
utility::stream::size_type inTotal = 0; utility::stream::size_type inTotal = 0;
int curCol = 0; string::size_type curCol = 0;
if (progress) if (progress)
progress->start(0); progress->start(0);
@ -173,7 +174,7 @@ utility::stream::size_type b64Encoder::encode(utility::inputStream& in,
total += 4; total += 4;
curCol += 4; curCol += 4;
if (cutLines && curCol >= maxLineLength - 2 /* \r\n */ - 4 /* next bytes */) if (cutLines && curCol + 2 /* \r\n */ + 4 /* next bytes */ >= maxLineLength)
{ {
out.write("\r\n", 2); out.write("\r\n", 2);
curCol = 0; curCol = 0;