firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 23:23:04 +01:00
Code Issues

Misc.

Browse Source
This commit is contained in:
robocop 2008-05-14 09:24:14 +00:00
parent 90f3097d26
commit a2cd97355b
2 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jrd/SimilarToMatcher.h
View File

@ -690,7 +690,7 @@ void SimilarToMatcher<StrConverter, CharType>::Evaluator::parsePrimary(int* flag
if (patternPos >= patternEnd) if (patternPos >= patternEnd)
status_exception::raise(isc_invalid_similar_pattern, 0); status_exception::raise(isc_invalid_similar_pattern, 0);
SLONG len = patternPos++ - start; const SLONG len = patternPos++ - start;
typedef const UCHAR* (TextType::*GetCanonicalFunc)(int*) const; typedef const UCHAR* (TextType::*GetCanonicalFunc)(int*) const;
@ -1043,8 +1043,7 @@ bool SimilarToMatcher<StrConverter, CharType>::Evaluator::match(int limit, int s
case opAnyOf: case opAnyOf:
if (bufferPos >= bufferEnd) if (bufferPos >= bufferEnd)
return false; return false;
else
{
if (notInSet(bufferPos, 1, node->str, node->len) != 0) if (notInSet(bufferPos, 1, node->str, node->len) != 0)
{ {
const UCHAR* end = node->str2 + node->len2; const UCHAR* end = node->str2 + node->len2;
@ -1096,7 +1095,6 @@ bool SimilarToMatcher<StrConverter, CharType>::Evaluator::match(int limit, int s
if (p < end) if (p < end)
return false; return false;
} }
}
++bufferPos; ++bufferPos;
break; break;

5
src/remote/server.cpp
View File

@ -508,7 +508,7 @@ void SRVR_multi_thread( rem_port* main_port, USHORT flags)
} }
if (dataSize) if (dataSize)
{ {
SSHORT asyncSize = port->asyncReceive(&asyncPacket, buffer, dataSize); const SSHORT asyncSize = port->asyncReceive(&asyncPacket, buffer, dataSize);
if (asyncSize == dataSize) if (asyncSize == dataSize)
{ {
port = NULL; port = NULL;
@ -5224,7 +5224,8 @@ SSHORT rem_port::asyncReceive(PACKET* asyncPacket, const UCHAR* buffer, SSHORT d
port_async_receive->receive(asyncPacket); port_async_receive->receive(asyncPacket);
} }
SSHORT asyncSize = dataSize - port_async_receive->port_receive.x_handy; const SSHORT asyncSize = dataSize - port_async_receive->port_receive.x_handy;
fb_assert(asyncSize >= 0);
switch(asyncPacket->p_operation) switch(asyncPacket->p_operation)
{ {