paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-28 17:19:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Better version of nilpchar

Browse Source
This commit is contained in:
Michaël Van Canneyt 2023-11-10 15:21:14 +01:00 committed by Pierre Muller
parent 1fa2c1e308
commit 538141978f
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/fcl-base/src/syncobjs.pp
View File

@ -616,13 +616,6 @@ end;
TSemaphore TSemaphore
---------------------------------------------------------------------} ---------------------------------------------------------------------}
function NilPChar(Const aName : String) : PChar; inline;
begin
Result:=Nil;
if aName='' then
Result:=PChar(aName);
end;
constructor TSemaphore.Create(aUseCOMWait: boolean = false); constructor TSemaphore.Create(aUseCOMWait: boolean = false);
begin begin
@ -638,7 +631,7 @@ var
begin begin
{$IFDEF WINDOWS} {$IFDEF WINDOWS}
inherited Create(aUseCOMWait); inherited Create(aUseCOMWait);
PN:=NilPchar(aName); PN:=Pchar(Pointer(aName));
{$IF SIZEOF(CHAR)=1} {$IF SIZEOF(CHAR)=1}
FHandle:=TEventHandle(CreateSemaphoreA(aAttributes,aInitial,aMaximum,PN)); FHandle:=TEventHandle(CreateSemaphoreA(aAttributes,aInitial,aMaximum,PN));
{$ELSE} {$ELSE}
@ -670,7 +663,7 @@ begin
Create(Nil,1,1,aName,aUseCOMWait); Create(Nil,1,1,aName,aUseCOMWait);
{$ELSE WINDOWS} {$ELSE WINDOWS}
inherited Create(aUseCOMWait); inherited Create(aUseCOMWait);
PN:=NilPChar(aName); PN:=PChar(Pointer(aName));
{$IF SIZEOF(CHAR)=1} {$IF SIZEOF(CHAR)=1}
FHandle:=TEventHandle(OpenSemaphoreA(aAccess,aInherit,PN)); FHandle:=TEventHandle(OpenSemaphoreA(aAccess,aInherit,PN));
{$ELSE} {$ELSE}
@ -863,7 +856,7 @@ begin
{$ELSE} {$ELSE}
{$IFDEF WINDOWS} {$IFDEF WINDOWS}
inherited Create(aUseCOMWait); inherited Create(aUseCOMWait);
PN:=NilPChar(aName); PN:=PChar(Pointer(aName));
{$IF SIZEOF(CHAR)=1} {$IF SIZEOF(CHAR)=1}
FHandle:=TEventHandle(CreateMutexA(aAttributes,aInitialOwner,PN)); FHandle:=TEventHandle(CreateMutexA(aAttributes,aInitialOwner,PN));
{$ELSE} {$ELSE}
@ -890,7 +883,7 @@ begin
{$ELSE} {$ELSE}
{$IFDEF WINDOWS} {$IFDEF WINDOWS}
inherited Create(aUseCOMWait); inherited Create(aUseCOMWait);
PN:=NilPChar(aName); PN:=PChar(Pointer(aName));
{$IF SIZEOF(CHAR)=1} {$IF SIZEOF(CHAR)=1}
FHandle:=TEventHandle(OpenMutexA(aAccess,aInherit,PN)); FHandle:=TEventHandle(OpenMutexA(aAccess,aInherit,PN));
{$ELSE} {$ELSE}