paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-17 12:39:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Patch to make db library loading code more uniform

Browse Source 
git-svn-id: trunk@22917 -
This commit is contained in:
michael 2012-11-02 11:01:20 +00:00
parent 920e34b3ff
commit 2bb25ea14f
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/dblib/src/dblib.pp
View File

@ -361,7 +361,8 @@ var
dbclose: procedure(dbproc:PDBPROCESS); cdecl;
{$ENDIF}
DefaultDBLibLibraryName: String = DBLIBDLL;
DefaultDBLibLibraryName: string = DBLIBDLL;
DBLibLoadedLibrary: string = '';
{$ENDIF}
{$IFDEF ntwdblib}
@ -378,7 +379,7 @@ procedure dbwinexit;
function dbsetlcharset(login:PLOGINREC; charset:PChar):RETCODE;
function dbsetlsecure(login:PLOGINREC):RETCODE;
procedure InitialiseDBLib(LibraryName : string = '');
function InitialiseDBLib(const LibraryName : shortstring = ''): integer;
procedure ReleaseDBLib;
implementation
@ -389,10 +390,11 @@ uses SysUtils, Dynlibs;
var DBLibLibraryHandle: TLibHandle;
RefCount: integer;
procedure InitialiseDBLib(LibraryName : string);
function InitialiseDBLib(const LibraryName : shortstring): integer;
var libname : string;
begin
inc(RefCount);
Result:=RefCount;
if RefCount = 1 then
begin
if LibraryName='' then
@ -406,6 +408,7 @@ begin
raise EInOutError.CreateFmt('Can not load DB-Lib client library "%s". Check your installation.'+LineEnding+'%s',
[libname, SysErrorMessage(GetLastOSError)]);
end;
DBLibLoadedLibrary := libname;
pointer(dbinit) := GetProcedureAddress(DBLibLibraryHandle,'dbinit');
pointer(dblogin) := GetProcedureAddress(DBLibLibraryHandle,'dblogin');
@ -463,7 +466,10 @@ begin
begin
dbexit;{$IFDEF WINDOWS}dbwinexit;{$ENDIF}
if UnloadLibrary(DBLibLibraryHandle) then
DBLibLibraryHandle := NilHandle
begin
DBLibLibraryHandle := NilHandle;
DBLibLoadedLibrary := '';
end
else
inc(RefCount);
end;