paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-12 07:26:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Added AddEmptyStrings to ExtractStrings (bug 25633)

Browse Source 
git-svn-id: trunk@26600 -
This commit is contained in:
michael 2014-01-28 08:38:29 +00:00
parent b023e30164
commit b5a2b3860b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rtl/objpas/classes/classes.inc
View File

@ -625,7 +625,7 @@ end;
* Miscellaneous procedures and functions * * Miscellaneous procedures and functions *
**********************************************************************} **********************************************************************}
function ExtractStrings(Separators, WhiteSpace: TSysCharSet; Content: PChar; Strings: TStrings): Integer; function ExtractStrings(Separators, WhiteSpace: TSysCharSet; Content: PChar; Strings: TStrings; AddEmptyStrings : Boolean = False): Integer;
var var
b, c : pchar; b, c : pchar;
@ -641,12 +641,13 @@ var
s : string; s : string;
begin begin
l := c-b; l := c-b;
if l > 0 then if (l > 0) or AddEmptyStrings then
begin begin
if assigned(Strings) then if assigned(Strings) then
begin begin
setlength(s, l); setlength(s, l);
move (b^, s[1],l); if l>0 then
move (b^, s[1],l*SizeOf(char));
Strings.Add (s); Strings.Add (s);
end; end;
inc (result); inc (result);

2
rtl/objpas/classes/classesh.inc
View File

@ -2141,5 +2141,5 @@ procedure ObjectTextToResource(Input, Output: TStream);
function LineStart(Buffer, BufPos: PChar): PChar; function LineStart(Buffer, BufPos: PChar): PChar;
procedure BinToHex(BinValue, HexValue: PChar; BinBufSize: Integer); procedure BinToHex(BinValue, HexValue: PChar; BinBufSize: Integer);
function HexToBin(HexValue, BinValue: PChar; BinBufSize: Integer): Integer; function HexToBin(HexValue, BinValue: PChar; BinBufSize: Integer): Integer;
function ExtractStrings(Separators, WhiteSpace: TSysCharSet; Content: PChar; Strings: TStrings): Integer; function ExtractStrings(Separators, WhiteSpace: TSysCharSet; Content: PChar; Strings: TStrings; AddEmptyStrings : Boolean = False): Integer;