From e30ae2294ba53e9083445ab8825394f6e3d2adf1 Mon Sep 17 00:00:00 2001 From: erickson Date: Wed, 7 Sep 2005 14:03:20 +0000 Subject: [PATCH] changed initialize to osrfAppInitialize and childInit to osrfAppChildInit git-svn-id: svn://svn.open-ils.org/ILS/trunk@1809 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- OpenSRF/src/c-apps/osrf_dbmath.c | 8 ++++---- OpenSRF/src/c-apps/osrf_math.c | 8 ++++---- OpenSRF/src/libstack/osrf_application.c | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/OpenSRF/src/c-apps/osrf_dbmath.c b/OpenSRF/src/c-apps/osrf_dbmath.c index a792245b1c..92ce665cba 100644 --- a/OpenSRF/src/c-apps/osrf_dbmath.c +++ b/OpenSRF/src/c-apps/osrf_dbmath.c @@ -2,12 +2,12 @@ #include "opensrf/osrf_application.h" #include "objson/object.h" -int initialize(); -int childInit(); +int osrfAppInitialize(); +int osrfAppChildInit(); int osrfMathRun( osrfMethodContext* ); -int initialize() { +int osrfAppInitialize() { osrfAppRegisterMethod( "opensrf.dbmath", "add", "osrfMathRun", "send 2 numbers and I'll add them", 2 ); osrfAppRegisterMethod( "opensrf.dbmath", "sub", "osrfMathRun", "send 2 numbers and I'll divide them", 2 ); osrfAppRegisterMethod( "opensrf.dbmath", "mult", "osrfMathRun", "send 2 numbers and I'll multiply them", 2 ); @@ -15,7 +15,7 @@ int initialize() { return 0; } -int childInit() { +int osrfAppChildInit() { return 0; } diff --git a/OpenSRF/src/c-apps/osrf_math.c b/OpenSRF/src/c-apps/osrf_math.c index c727c259c6..b074f17412 100644 --- a/OpenSRF/src/c-apps/osrf_math.c +++ b/OpenSRF/src/c-apps/osrf_math.c @@ -2,12 +2,12 @@ #include "opensrf/osrf_application.h" #include "objson/object.h" -int initialize(); -int childInit(); +int osrfAppInitialize(); +int osrfAppChildInit(); int osrfMathRun( osrfMethodContext* ); -int initialize() { +int osrfAppInitialize() { /* tell the server about the methods we handle */ osrfAppRegisterMethod( "opensrf.math", "add", "osrfMathRun", "send 2 numbers and I'll add them", 2 ); @@ -17,7 +17,7 @@ int initialize() { return 0; } -int childInit() { +int osrfAppChildInit() { return 0; } diff --git a/OpenSRF/src/libstack/osrf_application.c b/OpenSRF/src/libstack/osrf_application.c index c3d748596e..cb2c16e700 100644 --- a/OpenSRF/src/libstack/osrf_application.c +++ b/OpenSRF/src/libstack/osrf_application.c @@ -29,10 +29,10 @@ int osrfAppRegisterApplication( char* appName, char* soFile ) { /* see if we can run the initialize method */ int (*init) (void); - *(void **) (&init) = dlsym(app->handle, "initialize"); + *(void **) (&init) = dlsym(app->handle, "osrfAppInitialize"); if( (error = dlerror()) != NULL ) { - warning_handler("! Unable to locate method symbol [initialize] for app %s: %s", appName, error ); + warning_handler("! Unable to locate method symbol [osrfAppInitialize] for app %s: %s", appName, error ); } else { @@ -40,7 +40,7 @@ int osrfAppRegisterApplication( char* appName, char* soFile ) { int ret; if( (ret = (*init)()) ) { warning_handler("Application %s returned non-zero value from " - "'initialize', not registering...", appName ); + "'osrfAppInitialize', not registering...", appName ); //free(app->name); /* need a method to remove an application from the list */ //free(app); return ret; -- 2.43.2