opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-26 11:17:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert r2106 and a similar change. Fixes issue #1092.

Browse Source
This commit is contained in:
rosenfield.albert
2009-04-16 14:33:06 +00:00
parent 26a884164e
commit 6ee468fb26
1 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/helpers.pas
View File

@ -1533,12 +1533,6 @@ function escChars(Text: WideString; EscChar, Char1, Char2, Char3, Char4: WideCha
const
// Attempt to match whatever the CPU cache will hold.
block: Cardinal = 65536;
NLold1 = #13;
NLold2 = #10;
NullOld = #0;
NLnew1 = 'r';
NLnew2 = 'n';
NullNew = '0';
var
bstart, bend, matches, i: Cardinal;
// These could be bumped to uint64 if necessary.
@ -1557,37 +1551,20 @@ begin
(Text[i] = Char1) or
(Text[i] = Char2) or
(Text[i] = Char3) or
(Text[i] = Char4) or
(Text[i] = NLold1) or
(Text[i] = NLold2) or
(Text[i] = NullOld)
(Text[i] = Char4)
then Inc(matches);
SetLength(Result, bend + 1 - bstart + matches + respos);
for i := bstart to bend do begin
Inc(respos);
if
(Text[i] = Char1) or
(Text[i] = Char2) or
(Text[i] = Char3) or
(Text[i] = Char4) or
(Text[i] = NLold1) or
(Text[i] = NLold2) or
(Text[i] = NullOld)
(Text[i] = Char4)
then begin
Result[respos] := EscChar;
Inc(respos);
// Special cases for new line chars
if Text[i] = NLold1 then begin
Result[respos] := NLnew1;
continue;
end else if Text[i] = NLold2 then begin
Result[respos] := NLnew2;
continue;
end else if Text[i] = NullOld then begin
Result[respos] := NullNew;
continue;
end;
Result[respos] := EscChar;
end;
Inc(respos);
Result[respos] := Text[i];
end;
until bend = len;