paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-16 20:19:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Promoted result type of FPC_PCHAR_LENGTH and FPC_PWIDECHAR_LENGTH to SizeInt.

Browse Source 
+ Check for nil pointer in FPC_PWIDECHAR_LENGTH

git-svn-id: trunk@17733 -
This commit is contained in:
sergei 2011-06-13 04:59:17 +00:00
parent 0d71ef61fc
commit 4ebc34c5e7
10 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtl/arm/arm.inc
View File

@ -506,7 +506,7 @@ end;
{$ifndef FPC_SYSTEM_HAS_FPC_PCHAR_LENGTH} {$ifndef FPC_SYSTEM_HAS_FPC_PCHAR_LENGTH}
{$define FPC_SYSTEM_HAS_FPC_PCHAR_LENGTH} {$define FPC_SYSTEM_HAS_FPC_PCHAR_LENGTH}
function fpc_Pchar_length(p:Pchar):longint;assembler;nostackframe;[public,alias:'FPC_PCHAR_LENGTH'];compilerproc; function fpc_Pchar_length(p:Pchar):sizeint;assembler;nostackframe;[public,alias:'FPC_PCHAR_LENGTH'];compilerproc;
asm asm
cmp r0,#0 cmp r0,#0

2
rtl/arm/thumb2.inc
View File

@ -461,7 +461,7 @@ end;
{$ifndef FPC_SYSTEM_HAS_FPC_PCHAR_LENGTH} {$ifndef FPC_SYSTEM_HAS_FPC_PCHAR_LENGTH}
{$define FPC_SYSTEM_HAS_FPC_PCHAR_LENGTH} {$define FPC_SYSTEM_HAS_FPC_PCHAR_LENGTH}
function fpc_Pchar_length(p:Pchar):longint;assembler;nostackframe;[public,alias:'FPC_PCHAR_LENGTH'];compilerproc; function fpc_Pchar_length(p:Pchar):sizeint;assembler;nostackframe;[public,alias:'FPC_PCHAR_LENGTH'];compilerproc;
asm asm
cmp r0,#0 cmp r0,#0

2
rtl/i386/i386.inc
View File

@ -1144,7 +1144,7 @@ end;
{$ifndef FPC_SYSTEM_HAS_FPC_PCHAR_LENGTH} {$ifndef FPC_SYSTEM_HAS_FPC_PCHAR_LENGTH}
{$define FPC_SYSTEM_HAS_FPC_PCHAR_LENGTH} {$define FPC_SYSTEM_HAS_FPC_PCHAR_LENGTH}
function fpc_pchar_length(p:pchar):longint;assembler;[public,alias:'FPC_PCHAR_LENGTH']; compilerproc; function fpc_pchar_length(p:pchar):sizeint;assembler;[public,alias:'FPC_PCHAR_LENGTH']; compilerproc;
var var
saveedi : longint; saveedi : longint;

2
rtl/inc/cgeneric.inc
View File

@ -110,7 +110,7 @@ end;
function libc_pchar_length(p:pchar):size_t; cdecl; external 'c' name 'strlen'; function libc_pchar_length(p:pchar):size_t; cdecl; external 'c' name 'strlen';
function fpc_pchar_length(p:pchar):longint;[public,alias:'FPC_PCHAR_LENGTH']; compilerproc; function fpc_pchar_length(p:pchar):sizeint;[public,alias:'FPC_PCHAR_LENGTH']; compilerproc;
begin begin
if assigned(p) then if assigned(p) then
fpc_pchar_length:=libc_pchar_length(p) fpc_pchar_length:=libc_pchar_length(p)

4
rtl/inc/compproc.inc
View File

@ -67,8 +67,8 @@ function fpc_pchar_to_shortstr(p:pchar):shortstring; compilerproc;
procedure fpc_pchar_to_shortstr(out res : shortstring;p:pchar); compilerproc; procedure fpc_pchar_to_shortstr(out res : shortstring;p:pchar); compilerproc;
{$endif FPC_STRTOSHORTSTRINGPROC} {$endif FPC_STRTOSHORTSTRINGPROC}
function fpc_pchar_length(p:pchar):longint; compilerproc; function fpc_pchar_length(p:pchar):sizeint; compilerproc;
function fpc_pwidechar_length(p:pwidechar):longint; compilerproc; function fpc_pwidechar_length(p:pwidechar):sizeint; compilerproc;
{$ifndef FPC_STRTOSHORTSTRINGPROC} {$ifndef FPC_STRTOSHORTSTRINGPROC}
function fpc_chararray_to_shortstr(const arr: array of char; zerobased: boolean = true):shortstring; compilerproc; function fpc_chararray_to_shortstr(const arr: array of char; zerobased: boolean = true):shortstring; compilerproc;

12
rtl/inc/generic.inc
View File

@ -1243,8 +1243,8 @@ end;
{$ifndef FPC_SYSTEM_HAS_FPC_PCHAR_LENGTH} {$ifndef FPC_SYSTEM_HAS_FPC_PCHAR_LENGTH}
function fpc_pchar_length(p:pchar):longint;[public,alias:'FPC_PCHAR_LENGTH']; compilerproc; function fpc_pchar_length(p:pchar):sizeint;[public,alias:'FPC_PCHAR_LENGTH']; compilerproc;
var i : longint; var i : sizeint;
begin begin
i:=0; i:=0;
if assigned(p) then if assigned(p) then
@ -1257,11 +1257,13 @@ end;
{$ifndef FPC_SYSTEM_HAS_FPC_PWIDECHAR_LENGTH} {$ifndef FPC_SYSTEM_HAS_FPC_PWIDECHAR_LENGTH}
function fpc_pwidechar_length(p:pwidechar):longint;[public,alias:'FPC_PWIDECHAR_LENGTH']; compilerproc; function fpc_pwidechar_length(p:pwidechar):sizeint;[public,alias:'FPC_PWIDECHAR_LENGTH']; compilerproc;
var i : longint; var i : sizeint;
begin begin
i:=0; i:=0;
while p[i]<>#0 do inc(i); if assigned(p) then
while p[i]<>#0 do
inc(i);
exit(i); exit(i);
end; end;

2
rtl/inc/systemh.inc
View File

@ -812,7 +812,7 @@ Function Sseg:Word;{$ifdef SYSTEMINLINE}inline;{$endif}
****************************************************************************} ****************************************************************************}
function strpas(p:pchar):shortstring;{$ifdef SYSTEMINLINE}inline;{$endif} function strpas(p:pchar):shortstring;{$ifdef SYSTEMINLINE}inline;{$endif}
function strlen(p:pchar):longint;external name 'FPC_PCHAR_LENGTH'; function strlen(p:pchar):sizeint;external name 'FPC_PCHAR_LENGTH';
{ Shortstring functions } { Shortstring functions }
Procedure Delete(var s:shortstring;index:SizeInt;count:SizeInt); Procedure Delete(var s:shortstring;index:SizeInt;count:SizeInt);

2
rtl/nativent/system.pp
View File

@ -100,7 +100,7 @@ implementation
{ include system independent routines } { include system independent routines }
{$I system.inc} {$I system.inc}
function fpc_pwidechar_length(p: PWideChar): LongInt; external name 'FPC_PWIDECHAR_LENGTH'; function fpc_pwidechar_length(p: PWideChar): SizeInt; external name 'FPC_PWIDECHAR_LENGTH';
{ based on setup_arguments from Win32 RTL } { based on setup_arguments from Win32 RTL }
procedure setup_arguments; procedure setup_arguments;

2
rtl/nativent/sysutils.pp
View File

@ -673,7 +673,7 @@ end;
Initialization code Initialization code
****************************************************************************} ****************************************************************************}
function wstrlen(p: PWideChar): LongInt; external name 'FPC_PWIDECHAR_LENGTH'; function wstrlen(p: PWideChar): SizeInt; external name 'FPC_PWIDECHAR_LENGTH';
function GetEnvironmentVariable(const EnvVar: String): String; function GetEnvironmentVariable(const EnvVar: String): String;
var var

2
rtl/powerpc/powerpc.inc
View File

@ -1005,7 +1005,7 @@ procedure fpc_pchar_to_shortstr(out res : shortstring;p:pchar);assembler;[public
{$ifndef FPC_SYSTEM_HAS_FPC_PCHAR_LENGTH} {$ifndef FPC_SYSTEM_HAS_FPC_PCHAR_LENGTH}
{$define FPC_SYSTEM_HAS_FPC_PCHAR_LENGTH} {$define FPC_SYSTEM_HAS_FPC_PCHAR_LENGTH}
function fpc_pchar_length(p:pchar):longint;assembler;[public,alias:'FPC_PCHAR_LENGTH']; compilerproc; nostackframe; function fpc_pchar_length(p:pchar):sizeint;assembler;[public,alias:'FPC_PCHAR_LENGTH']; compilerproc; nostackframe;
{$include strlen.inc} {$include strlen.inc}
{$endif FPC_SYSTEM_HAS_FPC_PCHAR_LENGTH} {$endif FPC_SYSTEM_HAS_FPC_PCHAR_LENGTH}