paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-08 11:36:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removes unnecessary code to set the string terminators

Browse Source 
git-svn-id: trunk@32977 -
This commit is contained in:
sekelsenmat 2011-10-19 08:19:32 +00:00
parent bef43cabca
commit 5b05dc0fdd
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/lazutils/paswstring.pas
View File

@ -36,7 +36,6 @@ begin
// Copy the originating string taking into account the specified length // Copy the originating string taking into account the specified length
SetLength(widestr, len); SetLength(widestr, len);
System.Move(source^, widestr[1], len); System.Move(source^, widestr[1], len);
//PWideChar(@widestr)[len] := #0; // This corrupts the stack
// Now convert it, using UTF-8 -> UTF-16 // Now convert it, using UTF-8 -> UTF-16
dest := UTF16ToUTF8(widestr); dest := UTF16ToUTF8(widestr);
@ -48,10 +47,8 @@ var
begin begin
{$ifdef PASWSTRING_VERBOSE}WriteLn('Ansi2WideMove START');{$endif} {$ifdef PASWSTRING_VERBOSE}WriteLn('Ansi2WideMove START');{$endif}
// Copy the originating string taking into account the specified length // Copy the originating string taking into account the specified length
SetLength(ansistr, len+1);
System.Move(source^, ansistr[1], len);
ansistr[len+1] := #0;
SetLength(ansistr, len); SetLength(ansistr, len);
System.Move(source^, ansistr[1], len);
// Now convert it, using UTF-16 -> UTF-8 // Now convert it, using UTF-16 -> UTF-8
dest := UTF8ToUTF16(ansistr); dest := UTF8ToUTF16(ansistr);
@ -288,7 +285,6 @@ begin
// Copy the originating string taking into account the specified length // Copy the originating string taking into account the specified length
SetLength(widestr, len); SetLength(widestr, len);
System.Move(source^, widestr[1], len*2); System.Move(source^, widestr[1], len*2);
//PWideChar(@widestr)[len] := #0; // This corrupts the stack, even with SetLength(widestr, len+1)
// Now convert it, using UTF-8 -> UTF-16 // Now convert it, using UTF-8 -> UTF-16
dest := UTF16ToUTF8(widestr); dest := UTF16ToUTF8(widestr);
@ -300,10 +296,8 @@ var
begin begin
{$ifdef PASWSTRING_VERBOSE}WriteLn('Ansi2UnicodeMove START');{$endif} {$ifdef PASWSTRING_VERBOSE}WriteLn('Ansi2UnicodeMove START');{$endif}
// Copy the originating string taking into account the specified length // Copy the originating string taking into account the specified length
SetLength(ansistr, len+1);
System.Move(source^, ansistr[1], len);
ansistr[len+1] := #0;
SetLength(ansistr, len); SetLength(ansistr, len);
System.Move(source^, ansistr[1], len);
// Now convert it, using UTF-16 -> UTF-8 // Now convert it, using UTF-16 -> UTF-8
dest := UTF8ToUTF16(ansistr); dest := UTF8ToUTF16(ansistr);