--- Merging r14902 into '.':

U    rtl/unix/dynlibs.inc
U    rtl/wince/dynlibs.inc
U    rtl/netwlibc/dynlibs.inc
U    rtl/win/dynlibs.inc
U    rtl/os2/dynlibs.inc
C    rtl/inc/dynlibs.pas
--- Merging r16366 into '.':
G    rtl/unix/dynlibs.inc
G    rtl/wince/dynlibs.inc
G    rtl/netwlibc/dynlibs.inc
G    rtl/win/dynlibs.inc
G    rtl/os2/dynlibs.inc
G    rtl/inc/dynlibs.pas
Summary of conflicts:
  Text conflicts: 1

# revisions: 14902,16366
------------------------------------------------------------------------
r14902 | hajny | 2010-02-13 16:44:12 +0100 (Sat, 13 Feb 2010) | 1 line
Changed paths:
   M /trunk/rtl/inc/dynlibs.pas
   M /trunk/rtl/netwlibc/dynlibs.inc
   M /trunk/rtl/os2/dynlibs.inc
   M /trunk/rtl/unix/dynlibs.inc
   M /trunk/rtl/win/dynlibs.inc
   M /trunk/rtl/wince/dynlibs.inc

  * SharedSuffix moved to include files to reduce number of ifdefs
------------------------------------------------------------------------
------------------------------------------------------------------------
r16366 | sergei | 2010-11-18 23:09:48 +0100 (Thu, 18 Nov 2010) | 1 line
Changed paths:
   M /trunk/rtl/inc/dynlibs.pas
   M /trunk/rtl/netwlibc/dynlibs.inc
   M /trunk/rtl/os2/dynlibs.inc
   M /trunk/rtl/unix/dynlibs.inc
   M /trunk/rtl/win/dynlibs.inc
   M /trunk/rtl/wince/dynlibs.inc

* dynlibs.pas: added 'const' modifiers to eliminate unnecessary local string copies
------------------------------------------------------------------------

git-svn-id: branches/fixes_2_4@16865 -

rtl/inc/dynlibs.pas

@@ -33,35 +33,19 @@ interface
   ---------------------------------------------------------------------}
 
 
-Function SafeLoadLibrary(Name : AnsiString) : TLibHandle;
-Function LoadLibrary(Name : AnsiString) : TLibHandle;
-Function GetProcedureAddress(Lib : TlibHandle; ProcName : AnsiString) : Pointer;
+Function SafeLoadLibrary(const Name : AnsiString) : TLibHandle;
+Function LoadLibrary(const Name : AnsiString) : TLibHandle;
+Function GetProcedureAddress(Lib : TlibHandle; const ProcName : AnsiString) : Pointer;
 Function UnloadLibrary(Lib : TLibHandle) : Boolean;
 
 // Kylix/Delphi compability
 
 Function FreeLibrary(Lib : TLibHandle) : Boolean;
-Function GetProcAddress(Lib : TlibHandle; ProcName : AnsiString) : Pointer;
+Function GetProcAddress(Lib : TlibHandle; const ProcName : AnsiString) : Pointer;
 
 Type
   HModule = TLibHandle; 
 
-// these are for easier crossplatform construction of dll names in dynloading libs.
-Const
- {$ifdef Windows}
-  SharedSuffix  = 'dll';
- {$else}
-   {$ifdef Darwin}
-     SharedSuffix = 'dylib';
-   {$else}
-     {$ifdef OS2}
-       SharedSuffix = 'dll';
-     {$else}
-       SharedSuffix = 'so';  
-     {$endif}
-   {$endif}
- {$endif}      
-      
 Implementation
 
 { ---------------------------------------------------------------------
@@ -76,13 +60,13 @@ begin
   Result:=UnloadLibrary(lib);
 end;
 
-Function GetProcAddress(Lib : TlibHandle; ProcName : AnsiString) : Pointer;
+Function GetProcAddress(Lib : TlibHandle; const ProcName : AnsiString) : Pointer;
 
 begin
   Result:=GetProcedureAddress(Lib,Procname);
 end;
 
-Function SafeLoadLibrary(Name : AnsiString) : TLibHandle;
+Function SafeLoadLibrary(const Name : AnsiString) : TLibHandle;
 
 {$ifdef i386}
  var w : word;

rtl/netwlibc/dynlibs.inc

@@ -24,6 +24,8 @@ Type
 
 Const
   NilHandle = Nil;
+// these are for easier crossplatform construction of dll names in dynloading libs.
+  SharedSuffix = 'so';
 
 {$else}
 
@@ -33,13 +35,13 @@ Const
 
 uses libc;
 
-Function LoadLibrary(Name : AnsiString) : TLibHandle;
+Function LoadLibrary(const Name : AnsiString) : TLibHandle;
 
 begin
   Result:=dlopen(Pchar(Name),RTLD_LAZY);
 end;
 
-Function GetProcedureAddress(Lib : TLibHandle; ProcName : AnsiString) : Pointer;
+Function GetProcedureAddress(Lib : TLibHandle; const ProcName : AnsiString) : Pointer;
 
 begin
   Result:=dlsym(lib,pchar(ProcName));

rtl/os2/dynlibs.inc

@@ -25,6 +25,8 @@ type
 
 const
  NilHandle = 0;
+// these are for easier crossplatform construction of dll names in dynloading libs.
+ SharedSuffix  = 'dll';
 
 {$else}
 
@@ -35,7 +37,7 @@ const
 uses
  DosCalls;
 
-function LoadLibrary (Name: AnsiString): TLibHandle;
+function LoadLibrary (const Name: AnsiString): TLibHandle;
 var
  ErrPath: array [0..259] of char;
  Handle: longint;
@@ -44,7 +46,7 @@ begin
                                 then Result := Handle else Result := NilHandle;
 end;
 
-function GetProcedureAddress (Lib: TLibHandle; ProcName: AnsiString): pointer;
+function GetProcedureAddress (Lib: TLibHandle; const ProcName: AnsiString): pointer;
 var
  P: pointer;
 begin

rtl/unix/dynlibs.inc

@@ -25,6 +25,12 @@ Type
 
 Const
   NilHandle = TLibHandle(0);
+// these are for easier crossplatform construction of dll names in dynloading libs.
+{$ifdef Darwin}
+  SharedSuffix = 'dylib';
+{$else Darwin}
+  SharedSuffix = 'so';
+{$endif Darwin}
 
 {$else}
 
@@ -34,13 +40,13 @@ Const
 
 uses dl;
 
-Function LoadLibrary(Name : AnsiString) : TLibHandle;
+Function LoadLibrary(const Name : AnsiString) : TLibHandle;
 
 begin
   Result:=TLibHandle(dlopen(Pchar(Name),RTLD_LAZY));
 end;
 
-Function GetProcedureAddress(Lib : TLibHandle; ProcName : AnsiString) : Pointer;
+Function GetProcedureAddress(Lib : TLibHandle; const ProcName : AnsiString) : Pointer;
 
 begin
   Result:=dlsym(lib,pchar(ProcName));

rtl/win/dynlibs.inc

@@ -25,6 +25,8 @@ Type
 
 Const
   NilHandle = 0;
+// these are for easier crossplatform construction of dll names in dynloading libs.
+  SharedSuffix = 'dll';
 
 {$else}
 
@@ -34,13 +36,13 @@ Const
 
 Uses windows;
 
-Function LoadLibrary(Name : AnsiString) : TlibHandle;
+Function LoadLibrary(const Name : AnsiString) : TlibHandle;
 
 begin
   Result:=Windows.LoadLibrary(PChar(Name));
 end;
 
-Function GetProcedureAddress(Lib : TLibHandle; ProcName : AnsiString) : Pointer;
+Function GetProcedureAddress(Lib : TLibHandle; const ProcName : AnsiString) : Pointer;
 
 begin
   Result:=Windows.GetProcAddress(Lib,PChar(ProcName));

rtl/wince/dynlibs.inc

@@ -25,6 +25,8 @@ Type
 
 Const
   NilHandle = 0;
+// these are for easier crossplatform construction of dll names in dynloading libs.
+  SharedSuffix = 'dll';
 
 {$else}
 
@@ -34,7 +36,7 @@ Const
 
 Uses windows;
 
-Function LoadLibrary(Name : AnsiString) : TlibHandle;
+Function LoadLibrary(const Name : AnsiString) : TlibHandle;
 var
   ws: PWideChar;
 begin
@@ -43,7 +45,7 @@ begin
   FreeMem(ws);
 end;
 
-Function GetProcedureAddress(Lib : TLibHandle; ProcName : AnsiString) : Pointer;
+Function GetProcedureAddress(Lib : TLibHandle; const ProcName : AnsiString) : Pointer;
 var
   ws: PWideChar;
 begin