From 8edf658ff0f7e2d4bcd3d0ab4330b77a55a20f62 Mon Sep 17 00:00:00 2001 From: erickson Date: Fri, 16 May 2008 13:14:41 +0000 Subject: [PATCH] Patch from Scott McKellar: This patch replaces a couple of deprecated identifiers with their camelCase equivalents: osrf_app_client_session_init ==> osrfAppSessionClientInit osrf_message ==> osrfMessage git-svn-id: svn://svn.open-ils.org/ILS/trunk@9626 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/c-apps/oils_dataloader.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Open-ILS/src/c-apps/oils_dataloader.c b/Open-ILS/src/c-apps/oils_dataloader.c index 3ebe2f9205..a071963226 100644 --- a/Open-ILS/src/c-apps/oils_dataloader.c +++ b/Open-ILS/src/c-apps/oils_dataloader.c @@ -93,7 +93,7 @@ int main (int argc, char **argv) { free(idl_filename); // Connect to open-ils.cstore - session = osrf_app_client_session_init(CSTORE); + session = osrfAppSessionClientInit(CSTORE); osrfAppSessionConnect(session); // Start a transaction @@ -162,7 +162,7 @@ static int commitTransaction () { int ret = 1; const jsonObject* data; int req_id = osrfAppSessionMakeRequest( session, NULL, "open-ils.cstore.transaction.commit", 1, NULL ); - osrf_message* res = osrfAppSessionRequestRecv( session, req_id, 5 ); + osrfMessage* res = osrfAppSessionRequestRecv( session, req_id, 5 ); if ( (data = osrfMessageGetResult(res)) ) { if(!(trans_id = jsonObjectGetString(data))) { ret = 0; @@ -179,7 +179,7 @@ static int rollbackTransaction () { int ret = 1; const jsonObject* data; int req_id = osrfAppSessionMakeRequest( session, NULL, "open-ils.cstore.transaction.rollback", 1, NULL ); - osrf_message* res = osrfAppSessionRequestRecv( session, req_id, 5 ); + osrfMessage* res = osrfAppSessionRequestRecv( session, req_id, 5 ); if ( (data = osrfMessageGetResult(res)) ) { if(!(trans_id = jsonObjectGetString(data))) { ret = 0; @@ -196,7 +196,7 @@ static int startTransaction () { int ret = 1; jsonObject* data; int req_id = osrfAppSessionMakeRequest( session, NULL, "open-ils.cstore.transaction.begin", 1, NULL ); - osrf_message* res = osrfAppSessionRequestRecv( session, req_id, 5 ); + osrfMessage* res = osrfAppSessionRequestRecv( session, req_id, 5 ); if ( (data = osrfMessageGetResult(res)) ) { if(!(trans_id = jsonObjectToSimpleString(data))) { ret = 0; @@ -232,7 +232,7 @@ static int sendCommand ( const char* json ) { int req_id = osrfAppSessionMakeRequest( session, params, method_name, 1, NULL ); jsonObjectFree(params); - osrf_message* res = osrfAppSessionRequestRecv( session, req_id, 5 ); + osrfMessage* res = osrfAppSessionRequestRecv( session, req_id, 5 ); if (res) { if ( !(data = osrfMessageGetResult(res)) ) { -- 2.43.2