From 774e2b5cb6a647adfb811b7da8694f9fb4f5f875 Mon Sep 17 00:00:00 2001 From: miker Date: Mon, 19 Nov 2007 03:31:43 +0000 Subject: [PATCH] Patch from Scott McKellar to implement const-correctness and move to the newStyleNames instead of the old_style_names git-svn-id: svn://svn.open-ils.org/ILS/trunk@8083 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/apachemods/mod_rest_gateway.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Open-ILS/src/apachemods/mod_rest_gateway.c b/Open-ILS/src/apachemods/mod_rest_gateway.c index 0ab87c55b6..8adff62e7d 100644 --- a/Open-ILS/src/apachemods/mod_rest_gateway.c +++ b/Open-ILS/src/apachemods/mod_rest_gateway.c @@ -69,7 +69,7 @@ static int mod_ils_gateway_method_handler (request_rec *r) { jsonObjectSetKey(response, "payload", payload ); /* verify we are connected */ - if(!osrf_system_get_transport_client()) { + if(!osrfSystemGetTransportClient()) { osrfLogError( OSRF_LOG_MARK, "Bootstrap Failed, no transport client"); return HTTP_INTERNAL_SERVER_ERROR; } @@ -150,12 +150,12 @@ static int mod_ils_gateway_method_handler (request_rec *r) { osrfLogDebug( OSRF_LOG_MARK, "MOD session service: %s", session->remote_service ); - int req_id = osrf_app_session_make_req( session, NULL, method, 1, sarray ); + int req_id = osrfAppSessionMakeRequest( session, NULL, method, 1, sarray ); string_array_destroy(sarray); osrf_message* omsg = NULL; - while((omsg = osrf_app_session_request_recv( session, req_id, 60 ))) { + while((omsg = osrfAppSessionRequestRecv( session, req_id, 60 ))) { jsonObjectSetKey(response, "status", jsonNewNumberObject(omsg->status_code)); @@ -168,7 +168,7 @@ static int mod_ils_gateway_method_handler (request_rec *r) { char* t = omsg->status_text ? omsg->status_text : "No Error Message"; jsonObjectSetKey(response, "debug", jsonNewObject("\n\n%s:\n%s\n", s, t)); osrfLogError( OSRF_LOG_MARK, "Gateway received error: %s", - jsonObjectGetString(jsonObjectGetKey(response, "debug"))); + jsonObjectGetString(jsonObjectGetKeyConst(response, "debug"))); break; } @@ -192,7 +192,7 @@ static int mod_ils_gateway_method_handler (request_rec *r) { osrfLogDebug( OSRF_LOG_MARK, "gateway process message successfully"); - osrf_app_session_destroy(session); + osrfAppSessionFree(session); return OK; -- 2.11.0