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

Make it compile with MSVC6

Browse Source
This commit is contained in:
alexpeshkoff 2004-03-07 11:52:05 +00:00
parent d01b4103cd
commit dfb7575e3e
1 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/jrd/rse.cpp
View File

@ -20,7 +20,7 @@
* All Rights Reserved. * All Rights Reserved.
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
* *
* $Id: rse.cpp,v 1.56 2004-03-07 09:48:56 dimitr Exp $ * $Id: rse.cpp,v 1.57 2004-03-07 11:52:05 alexpeshkoff Exp $
* *
* 2001.07.28: John Bellardo: Implemented rse_skip and made rse_first work with * 2001.07.28: John Bellardo: Implemented rse_skip and made rse_first work with
* seekable streams. * seekable streams.
@ -3357,20 +3357,22 @@ static void pop_rpbs(jrd_req* request, Rsb* rsb)
break; break;
case rsb_sort: case rsb_sort:
streams.grow(request->req_count);
memset(streams.begin(), 0, request->req_count * sizeof(UCHAR));
map = (smb*) rsb->rsb_arg[0];
end_item = map->smb_rpt + map->smb_count;
for (item = map->smb_rpt; item < end_item; item++)
{ {
streams[item->smb_stream] = 1; streams.grow(request->req_count);
} memset(streams.begin(), 0, request->req_count * sizeof(UCHAR));
for (int i = 0; i < request->req_count; i++) map = (smb*) rsb->rsb_arg[0];
{ end_item = map->smb_rpt + map->smb_count;
if (streams[i]) for (item = map->smb_rpt; item < end_item; item++)
{ {
rpb = request->req_rpb + i; streams[item->smb_stream] = 1;
restore_record(rpb); }
for (int i = 0; i < request->req_count; i++)
{
if (streams[i])
{
rpb = request->req_rpb + i;
restore_record(rpb);
}
} }
} }
break; break;
@ -3470,20 +3472,22 @@ static void push_rpbs(TDBB tdbb, jrd_req* request, Rsb* rsb)
break; break;
case rsb_sort: case rsb_sort:
streams.grow(request->req_count);
memset(streams.begin(), 0, request->req_count * sizeof(UCHAR));
map = (smb*) rsb->rsb_arg[0];
end_item = map->smb_rpt + map->smb_count;
for (item = map->smb_rpt; item < end_item; item++)
{ {
streams[item->smb_stream] = 1; streams.grow(request->req_count);
} memset(streams.begin(), 0, request->req_count * sizeof(UCHAR));
for (int i = 0; i < request->req_count; i++) map = (smb*) rsb->rsb_arg[0];
{ end_item = map->smb_rpt + map->smb_count;
if (streams[i]) for (item = map->smb_rpt; item < end_item; item++)
{ {
rpb = request->req_rpb + i; streams[item->smb_stream] = 1;
save_record(tdbb, rpb); }
for (int i = 0; i < request->req_count; i++)
{
if (streams[i])
{
rpb = request->req_rpb + i;
save_record(tdbb, rpb);
}
} }
} }
break; break;