generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-27 11:06:50 +01:00
Code Issues Projects Releases Wiki Activity

trunk/branch integration: TextEncoding update

Browse Source
This commit is contained in:
Marian Krivos
2011-08-22 18:28:11 +00:00
parent 150fe64cac
commit a7ef753307
1 changed files with 34 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
Foundation/src/StreamConverter.cpp
View File

@@ -85,34 +85,28 @@ int StreamConverterBuf::readFromDevice()
poco_assert (c < 256); poco_assert (c < 256);
int uc; int uc;
int n = _inEncoding.characterMap()[c]; _buffer [0] = (unsigned char) c;
if (n == -1) int n = _inEncoding.queryConvert(_buffer, 1);
int read = 1;
while (-1 > n)
{
poco_assert_dbg(-n <= sizeof(_buffer));
_pIstr->read((char*) _buffer + read, -n - read);
read = -n;
n = _inEncoding.queryConvert(_buffer, -n);
}
if (-1 >= n)
{ {
uc = _defaultChar; uc = _defaultChar;
++_errors; ++_errors;
} }
else if (n >= 0)
uc = n;
else else
{ {
poco_assert_dbg(-n <= sizeof(_buffer)); uc = n;
_buffer[0] = (unsigned char) c;
_pIstr->read((char*) _buffer + 1, -n - 1);
if (_pIstr->gcount() == -n - 1)
{
uc = _inEncoding.convert(_buffer);
if (uc == -1)
{
uc = _defaultChar;
++_errors;
}
}
else
{
uc = _defaultChar;
++_errors;
}
} }
_sequenceLength = _outEncoding.convert(uc, _buffer, sizeof(_buffer)); _sequenceLength = _outEncoding.convert(uc, _buffer, sizeof(_buffer));
if (_sequenceLength == 0) if (_sequenceLength == 0)
_sequenceLength = _outEncoding.convert(_defaultChar, _buffer, sizeof(_buffer)); _sequenceLength = _outEncoding.convert(_defaultChar, _buffer, sizeof(_buffer));
@@ -127,34 +121,31 @@ int StreamConverterBuf::writeToDevice(char c)
{ {
poco_assert_dbg (_pOstr); poco_assert_dbg (_pOstr);
if (_sequenceLength == 0) _buffer[_pos++] = (unsigned char) c;
if (_sequenceLength == 0 || _sequenceLength == _pos)
{ {
int n = _inEncoding.characterMap()[(unsigned char) c]; int n = _inEncoding.queryConvert(_buffer, _pos);
if (n == -1) if (-1 <= n)
{ {
++_errors; int uc = n;
return -1; if (-1 == n)
{
++_errors;
return -1;
}
int n = _outEncoding.convert(uc, _buffer, sizeof(_buffer));
if (n == 0) n = _outEncoding.convert(_defaultChar, _buffer, sizeof(_buffer));
poco_assert_dbg (n <= sizeof(_buffer));
_pOstr->write((char*) _buffer, n);
_sequenceLength = 0;
_pos = 0;
} }
_buffer[0] = (unsigned char) c; else
_sequenceLength = n < 0 ? -n : 1;
_pos = 1;
}
else _buffer[_pos++] = (unsigned char) c;
if (_pos == _sequenceLength)
{
int uc = _inEncoding.convert(_buffer);
if (uc == -1)
{ {
++_errors; _sequenceLength = -n;
return -1;
} }
int n = _outEncoding.convert(uc, _buffer, sizeof(_buffer));
if (n == 0) n = _outEncoding.convert(_defaultChar, _buffer, sizeof(_buffer));
poco_assert_dbg (n <= sizeof(_buffer));
_pOstr->write((char*) _buffer, n);
_sequenceLength = 0;
_pos = 0;
} }
return charToInt(c); return charToInt(c);
} }