diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-02-07 11:21:37 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-02-07 16:02:14 +0100 |
| commit | 2d21560b780060114c2e9ab95d6a4680a590ab0f (patch) | |
| tree | 826d414dbc549cb481a0a0771d7f4303a123acef /dbaccess | |
| parent | 04c0a05f58618f53e1be83856ebc2b615066391a (diff) | |
sal_uInt8 is typedefed as unsigned char so this casting isn't needed
Change-Id: I190bbcb915664ed0cf803814c399b841ae41c519
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129594
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/filter/hsqldb/rowinputbinary.cxx | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/dbaccess/source/filter/hsqldb/rowinputbinary.cxx b/dbaccess/source/filter/hsqldb/rowinputbinary.cxx index 1a71ad9276e1..f7a927a487de 100644 --- a/dbaccess/source/filter/hsqldb/rowinputbinary.cxx +++ b/dbaccess/source/filter/hsqldb/rowinputbinary.cxx @@ -165,9 +165,8 @@ OUString HsqlRowInputStream::readUTF(sal_Int32 nUTFLen) sal_Int32 nStrLen = 0; while (nCount < nUTFLen) { - unsigned char cIn = 0; - m_pStream->ReadUChar(cIn); - sal_uInt8 c = reinterpret_cast<sal_uInt8&>(cIn); + sal_uInt8 c = 0; + m_pStream->ReadUChar(c); sal_uInt8 char2, char3; switch (c >> 4) { @@ -193,8 +192,7 @@ OUString HsqlRowInputStream::readUTF(sal_Int32 nUTFLen) throw WrongFormatException(); } - m_pStream->ReadUChar(cIn); - char2 = reinterpret_cast<sal_uInt8&>(cIn); + m_pStream->ReadUChar(char2); if ((char2 & 0xC0) != 0x80) { throw WrongFormatException(); @@ -211,10 +209,8 @@ OUString HsqlRowInputStream::readUTF(sal_Int32 nUTFLen) throw WrongFormatException(); } - m_pStream->ReadUChar(cIn); - char2 = reinterpret_cast<sal_uInt8&>(cIn); - m_pStream->ReadUChar(cIn); - char3 = reinterpret_cast<sal_uInt8&>(cIn); + m_pStream->ReadUChar(char2); + m_pStream->ReadUChar(char3); if (((char2 & 0xC0) != 0x80) || ((char3 & 0xC0) != 0x80)) { @@ -234,9 +230,8 @@ OUString HsqlRowInputStream::readUTF(sal_Int32 nUTFLen) bool HsqlRowInputStream::checkNull() { - unsigned char cIn = 0; - m_pStream->ReadUChar(cIn); - sal_uInt8 nNull = reinterpret_cast<sal_uInt8&>(cIn); + sal_uInt8 nNull = 0; + m_pStream->ReadUChar(nNull); return nNull == 0; } |