Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/buffer/BaseBufferProcessor.h
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ class BaseBufferProcessor {
// Note: the last call of 'Process' method must be done with this hint set to true!
void SetHint(bool isLastBlock = true);

// Runs convertion of the preconfigured input buffer.
// Runs conversion of the preconfigured input buffer.
// The output is written into preconfigured output buffer (or bufferS in multi-stream case).
// The method returns:
// 'true':
Expand Down
4 changes: 2 additions & 2 deletions src/buffer/ProcessorPlugins.h
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,9 @@ class InteractiveInput : public InputPlugin {
// and then automatically copied into the user's byte array.
// Note that this means minor performance loss due to additional memcpy of the output data.
// You do not need to do anything special to handle this case, no difference is visible from the outside.
//
//
// Note that the static method ContiguousOutput::GetMaxOutputSize can be used without plugin
// in order to see which size of output buffer is needed to surely accomodate result of conversion.
// in order to see which size of output buffer is needed to surely accommodate result of conversion.
//
class ContiguousOutput : public OutputPlugin {
BaseBufferProcessor *processor;
Expand Down
4 changes: 2 additions & 2 deletions src/message/MessageConverter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ConversionResult ConvertInMemory(BaseBufferProcessor &processor, const char *inp
result.status = (ConversionStatus)-1;
result.inputSize = 0;
result.outputSize = 0;

if (inputSize < 0 || (!inputBuffer && inputSize != 0)) {
result.status = csInputOutputNoAccess;
return result;
Expand Down Expand Up @@ -43,7 +43,7 @@ ConversionResult ConvertInMemory(BaseBufferProcessor &processor, const char *inp
result.outputSize = output.GetFilledOutputSize();

if (result.status == csIncorrectData) {
//hard error occured inside loop
//hard error occurred inside loop
}
else if (input.GetRemainingDataSize() != 0) {
//some bytes remain in the input
Expand Down
6 changes: 3 additions & 3 deletions src/tests/FileConverter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ struct Config {
bool srcRandomChars[4]; // -- | --
bool dstPrintHash; // output: [hash]
bool countBytes; // --countbytes

Config() {
srcFormat = dfUtf8;
dstFormat = dfUtf16;
Expand All @@ -90,7 +90,7 @@ struct Config {
Check(checkMode >= cmFast && checkMode <= cmValidate, "Checking mode must be 0 (fast), 1 (full), or 2 (validate) (%d)", checkMode);
Check(!countBytes || (srcFormat == dfUtf8 && !fileToFile), "Counting bytes is only implemented for UTF-8 input and memory-to-memory");
if (maxBytesFast == 0) {
logprintf("Note: trivial convertion is used (no fast path)\n");
logprintf("Note: trivial conversion is used (no fast path)\n");
checkMode = cmValidate;
smallConverter = true;
errorCorrection = false;
Expand Down Expand Up @@ -119,7 +119,7 @@ struct Config {
}
logprintf(" Input (source) in %s: %s\n", GetFormatStr(srcFormat), (srcRandomLen >= 0 ? randomSrcMessage : srcPath));
logprintf(" Output (dest.) in %s: %s\n", GetFormatStr(dstFormat), (dstPrintHash ? "[print hash]" : dstPath));
if (fileToFile)
if (fileToFile)
logprintf(" Direct file-to-file conversion\n");

logprintf("Processor settings:\n");
Expand Down