Need to pass library name to registerRxFunctions()

This commit is contained in:
Mark Hessling
2002-07-29 07:13:28 +00:00
parent 230ca51de8
commit 1a38d7538a
3 changed files with 9 additions and 8 deletions

View File

@@ -18,7 +18,7 @@
* Mark Hessling M.Hessling@qut.edu.au http://www.lightlink.com/hessling/
*/
static char RCSid[] = "$Id: loader.c,v 1.5 2002/07/29 06:19:40 mark Exp $";
static char RCSid[] = "$Id: loader.c,v 1.6 2002/07/29 07:13:28 mark Exp $";
#include "rxpack.h"
@@ -220,7 +220,7 @@ int main
/*
* Register all external functions
*/
if ( ( rc = RegisterRxFunctions( RxPackageGlobalData, GETPACKAGEFUNCTIONS() ) ) != 0 )
if ( ( rc = RegisterRxFunctions( RxPackageGlobalData, GETPACKAGEFUNCTIONS(), RXPACKAGENAME ) ) != 0 )
return( rc );
/*
* Register a default subcommand handler to pass commands to the OS

View File

@@ -16,7 +16,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
static char RCSid[] = "$Id: rxpack.c,v 1.10 2002/07/29 06:57:33 mark Exp $";
static char RCSid[] = "$Id: rxpack.c,v 1.11 2002/07/29 07:12:03 mark Exp $";
#include "rxpack.h"
@@ -707,11 +707,12 @@ int RegisterRxSubcom
int RegisterRxFunctions
#ifdef HAVE_PROTO
( RxPackageGlobalDataDef *RxPackageGlobalData, RexxFunction *RxPackageFunctions )
( RxPackageGlobalDataDef *RxPackageGlobalData, RexxFunction *RxPackageFunctions, char *name )
#else
( RxPackageGlobalData, RxPackageFunctions )
( RxPackageGlobalData, RxPackageFunctions, name )
RxPackageGlobalDataDef *RxPackageGlobalData;
RexxFunction *RxPackageFunctions;
char *name;
#endif
{
@@ -728,7 +729,7 @@ fprintf(stderr,"%s %d %d %d %s\n",__FILE__,__LINE__,rc,func->DllLoad,func->Inter
if (func->DllLoad)
{
rc = RexxRegisterFunctionDll( func->ExternalName,
RXPACKAGENAME,
name,
func->InternalName );
InternalTrace( RxPackageGlobalData, "RegisterRxFunctions","%s-%d: Registered (DLL) %s with rc = %ld\n",__FILE__,__LINE__,func->ExternalName,rc);
}
@@ -871,7 +872,7 @@ RxPackageGlobalDataDef *InitRxPackage
{
*rc = (*ptr)( );
}
DEBUGDUMP(fprintf(stderr,"%s-%d: End of InitRxPackage with rc = %ld\n",__FILE__,__LINE__,rc);)
DEBUGDUMP(fprintf(stderr,"%s-%d: End of InitRxPackage with rc = %ld\n",__FILE__,__LINE__,*rc);)
return RxPackageGlobalData;
}

View File

@@ -203,7 +203,7 @@ void InternalTrace Args(( RxPackageGlobalDataDef *, char *, ... ));
void RxDisplayError Args(( RxPackageGlobalDataDef *, RFH_ARG0_TYPE, ... ));
RxPackageGlobalDataDef *InitRxPackage Args(( RxPackageGlobalDataDef *, PackageInitialiser, int * ));
int TermRxPackage Args(( RxPackageGlobalDataDef *, PackageTerminator, RexxFunction *, char *, int ));
int RegisterRxFunctions Args(( RxPackageGlobalDataDef *, RexxFunction * ));
int RegisterRxFunctions Args(( RxPackageGlobalDataDef *, RexxFunction *, char * ));
int RegisterRxSubcom Args(( RxPackageGlobalDataDef *, RexxSubcomHandler * ));
int QueryRxFunction Args(( RxPackageGlobalDataDef *, char * ));
int DeregisterRxFunctions Args(( RxPackageGlobalDataDef *, RexxFunction *, int ));