paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-01 13:30:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Patch from Reinier to cache libraryname in a global.

Browse Source 
git-svn-id: trunk@23014 -
This commit is contained in:
marco 2012-11-18 13:34:39 +00:00
parent e26f4ac798
commit 31e5ac3836
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/ibase/src/ibase60.inc
View File

@ -2463,7 +2463,9 @@ function InitialiseIBase60(Const LibraryName : AnsiString) : integer;
function InitialiseIBase60 : integer;
procedure ReleaseIBase60;
var IBaseLibraryHandle : TLibHandle;
var
IBaseLibraryHandle : TLibHandle;
IBaseLoadedLibrary : AnsiString;
{$ENDIF}
@ -2479,7 +2481,6 @@ ResourceString
var
RefCount : integer;
LoadedLibrary : String;
Function TryInitialiseIBase60(Const LibraryName : AnsiString) : integer;
@ -2491,7 +2492,7 @@ begin
if (IBaseLibraryHandle=nilhandle) then
Exit;
inc(RefCount);
LoadedLibrary:=LibraryName;
IBaseLoadedLibrary:=LibraryName;
pointer(isc_attach_database) := GetProcedureAddress(IBaseLibraryHandle,'isc_attach_database');
pointer(isc_array_gen_sdl) := GetProcedureAddress(IBaseLibraryHandle,'isc_array_gen_sdl');
pointer(isc_array_get_slice) := GetProcedureAddress(IBaseLibraryHandle,'isc_array_get_slice');
@ -2695,11 +2696,11 @@ begin
Result := TryInitialiseIBase60(LibraryName);
If Result = 0 then
Raise EInOutError.CreateFmt(SErrLoadFailed,[LibraryName])
else If (LibraryName<>LoadedLibrary) then
else If (LibraryName<>IBaseLoadedLibrary) then
begin
Dec(RefCount);
Result := RefCount;
Raise EInOUtError.CreateFmt(SErrAlreadyLoaded,[LoadedLibrary]);
Raise EInOUtError.CreateFmt(SErrAlreadyLoaded,[IBaseLoadedLibrary]);
end;
end;
@ -2713,7 +2714,7 @@ begin
begin
Dec(RefCount);
IBaseLibraryHandle := NilHandle;
LoadedLibrary:='';
IBaseLoadedLibrary:='';
end;
end;