* Some forgotten string -> shortstring instances

This commit is contained in:
Michael VAN CANNEYT 2023-01-07 19:59:02 +01:00 committed by Michaël Van Canneyt
parent 11e3b12354
commit 6084bb6d09
4 changed files with 12 additions and 12 deletions

View File

@ -29,7 +29,7 @@ type
{$ENDIF} {$ENDIF}
function GetLineInfo(addr:ptruint;var func,source:string;var line:longint) : boolean; function GetLineInfo(addr:ptruint;var func,source:string;var line:longint) : boolean;
function StabBackTraceStr(addr:CodePointer):string; function StabBackTraceStr(addr:CodePointer):shortstring;
procedure CloseStabs; procedure CloseStabs;
var var
@ -277,7 +277,7 @@ begin
seek(e.f,stabstrofs+dirstab.strpos); seek(e.f,stabstrofs+dirstab.strpos);
blockread(e.f,source[1],high(source)-1,res); blockread(e.f,source[1],high(source)-1,res);
dirlength:=strlen(@source[1]); dirlength:=strlen(@source[1]);
source[0]:=chr(dirlength); SetLength(source,dirlength);
end end
else else
dirlength:=0; dirlength:=0;
@ -285,13 +285,13 @@ begin
begin begin
seek(e.f,stabstrofs+filestab.strpos); seek(e.f,stabstrofs+filestab.strpos);
blockread(e.f,source[dirlength+1],high(source)-(dirlength+1),res); blockread(e.f,source[dirlength+1],high(source)-(dirlength+1),res);
source[0]:=chr(strlen(@source[1])); SetLength(source,strlen(@source[1]));
end; end;
if funcstab.ntype<>0 then if funcstab.ntype<>0 then
begin begin
seek(e.f,stabstrofs+funcstab.strpos); seek(e.f,stabstrofs+funcstab.strpos);
blockread(e.f,func[1],high(func)-1,res); blockread(e.f,func[1],high(func)-1,res);
func[0]:=chr(strlen(@func[1])); SetLength(func,strlen(@func[1]));
i:=pos(':',func); i:=pos(':',func);
if i>0 then if i>0 then
Delete(func,i,255); Delete(func,i,255);
@ -304,7 +304,7 @@ begin
end; end;
function StabBackTraceStr(addr:CodePointer):string; function StabBackTraceStr(addr:CodePointer):shortstring;
var var
func, func,
source : string; source : string;

View File

@ -32,7 +32,7 @@ type
{$ENDIF} {$ENDIF}
function GetLineInfo(addr:codeptruint;var func,source:string;var line:longint) : boolean; function GetLineInfo(addr:codeptruint;var func,source:string;var line:longint) : boolean;
function DwarfBackTraceStr(addr: CodePointer): string; function DwarfBackTraceStr(addr: CodePointer): shortstring;
procedure CloseDwarf; procedure CloseDwarf;
var var
@ -1415,7 +1415,7 @@ begin
end; end;
function DwarfBackTraceStr(addr: CodePointer): string; function DwarfBackTraceStr(addr: CodePointer): shortstring;
var var
func, func,
source : string; source : string;

View File

@ -685,7 +685,7 @@ End;
--- File --- --- File ---
******************************************************************************} ******************************************************************************}
Function FSearch(path : pathstr;dirlist : string) : pathstr; Function FSearch(path : pathstr;dirlist : shortstring) : pathstr;
Var Var
info : BaseUnix.stat; info : BaseUnix.stat;
Begin Begin
@ -806,7 +806,7 @@ Begin
End; End;
Function EnvStr (Index: longint): String; Function EnvStr (Index: longint): ShortString;
Var Var
i : longint; i : longint;
p : PPAnsiChar; p : PPAnsiChar;
@ -830,7 +830,7 @@ Begin
end; end;
Function GetEnv(EnvVar: String): String; Function GetEnv(EnvVar: ShortString): ShortString;
var var
p : PAnsiChar; p : PAnsiChar;
Begin Begin

View File

@ -252,7 +252,7 @@ begin
TimeZoneDir:=TimeZoneDir+'/'; TimeZoneDir:=TimeZoneDir+'/';
end; end;
function ReadTimezoneFile(fn:shortstring) : Boolean; function ReadTimezoneFile(fn:string) : Boolean;
function decode(const l:longint):longint; function decode(const l:longint):longint;
begin begin
@ -489,7 +489,7 @@ Const
{$ifndef FPC_HAS_GETTIMEZONEFILE} {$ifndef FPC_HAS_GETTIMEZONEFILE}
function GetTimezoneFile:shortstring; function GetTimezoneFile:string;
var var
f,len : longint; f,len : longint;
fn,s : shortstring; fn,s : shortstring;