These patches replace a couple of deprecated identifiers with their
camel-case equivalents:
osrf_message ==> osrfMessage
string_array ==> osrfStringArray
I'm afraid some of my recent patches have roiled the waters just as you
were trying to put a release together. For the time being I'll try to
confine myself to little innocuous clean-up patches.
Scptt McKellar
http://home.swbell.net/mck9/ct/
Developer's Certificate of Origin 1.1 By making a contribution to
this project, I certify that:
(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license indicated
in the file; or
(b) The contribution is based upon previous work that, to the best
of my knowledge, is covered under an appropriate open source license
and I have the right under that license to submit that work with
modifications, whether created in whole or in part by me, under the
same open source license (unless I am permitted to submit under a
different license), as indicated in the file; or
(c) The contribution was provided directly to me by some other person
who certified (a), (b) or (c) and I have not modified it; and
(d) In the case of each of (a), (b), or (c), I understand and agree
that this project and the contribution are public and that a record
of the contribution (including all personal information I submit
with it, including my sign-off) is maintained indefinitely and may
be redistributed consistent with this project or the open source
license indicated in the file.*** ./trunk/include/opensrf/osrf_app_session.h 2008-11-18 09:53:37.000000000 -0600
--- ./trunk-mod/include/opensrf/osrf_app_session.h 2008-11-18 11:49:26.000000000 -0600
***************
*** 31,39 ****
/** True if we have received a 'request complete' message from our request */
int complete;
/** Our original request payload */
! osrf_message* payload;
/** List of responses to our request */
! osrf_message* result;
/* if set to true, then a call that is waiting on a response, will reset the
timeout and set this variable back to false */
--- 31,39 ----
/** True if we have received a 'request complete' message from our request */
int complete;
/** Our original request payload */
! osrfMessage* payload;
/** List of responses to our request */
! osrfMessage* result;
/* if set to true, then a call that is waiting on a response, will reset the
timeout and set this variable back to false */
***************
*** 113,119 ****
*/
int osrfAppSessionMakeRequest(
osrfAppSession* session, const jsonObject* params,
! const char* method_name, int protocol, string_array* param_strings);
/** Sets the given request to complete state */
void osrf_app_session_set_complete( osrfAppSession* session, int request_id );
--- 113,119 ----
*/
int osrfAppSessionMakeRequest(
osrfAppSession* session, const jsonObject* params,
! const char* method_name, int protocol, osrfStringArray* param_strings);
/** Sets the given request to complete state */
void osrf_app_session_set_complete( osrfAppSession* session, int request_id );
***************
*** 122,128 ****
int osrf_app_session_request_complete( const osrfAppSession* session, int request_id );
/** Does a recv call on the given request */
! osrf_message* osrfAppSessionRequestRecv(
osrfAppSession* session, int request_id, int timeout );
/** Removes the request from the request set and frees the reqest */
--- 122,128 ----
int osrf_app_session_request_complete( const osrfAppSession* session, int request_id );
/** Does a recv call on the given request */
! osrfMessage* osrfAppSessionRequestRecv(
osrfAppSession* session, int request_id, int timeout );
/** Removes the request from the request set and frees the reqest */
***************
*** 140,146 ****
/** pushes the given message into the result list of the app_request
* whose request_id matches the messages thread_trace
*/
! int osrf_app_session_push_queue( osrfAppSession*, osrf_message* msg );
/** Attempts to connect to the remote service. Returns 1 on successful
* connection, 0 otherwise.
--- 140,146 ----
/** pushes the given message into the result list of the app_request
* whose request_id matches the messages thread_trace
*/
! int osrf_app_session_push_queue( osrfAppSession*, osrfMessage* msg );
/** Attempts to connect to the remote service. Returns 1 on successful
* connection, 0 otherwise.
*** ./trunk/src/srfsh/srfsh.c 2008-11-18 09:53:43.000000000 -0600
--- ./trunk-mod/src/srfsh/srfsh.c 2008-11-18 11:42:23.000000000 -0600
***************
*** 38,44 ****
static transport_client* client = NULL;
/* the last result we received */
! static osrf_message* last_result = NULL;
/* functions */
static int parse_request( char* request );
--- 38,44 ----
static transport_client* client = NULL;
/* the last result we received */
! static osrfMessage* last_result = NULL;
/* functions */
static int parse_request( char* request );
***************
*** 583,589 ****
int req_id = osrfAppSessionMakeRequest( session, params, method, 1, NULL );
jsonObjectFree(params);
! osrf_message* omsg = osrfAppSessionRequestRecv( session, req_id, recv_timeout );
if(!omsg)
printf("\nReceived no data from server\n");
--- 583,589 ----
int req_id = osrfAppSessionMakeRequest( session, params, method, 1, NULL );
jsonObjectFree(params);
! osrfMessage* omsg = osrfAppSessionRequestRecv( session, req_id, recv_timeout );
if(!omsg)
printf("\nReceived no data from server\n");
***************
*** 868,874 ****
double start = get_timestamp_millis();
int req_id = osrfAppSessionMakeRequest( session, params, methods[j], 1, NULL );
! osrf_message* omsg = osrfAppSessionRequestRecv( session, req_id, 5 );
double end = get_timestamp_millis();
times[(4*i) + j] = end - start;
--- 868,874 ----
double start = get_timestamp_millis();
int req_id = osrfAppSessionMakeRequest( session, params, methods[j], 1, NULL );
! osrfMessage* omsg = osrfAppSessionRequestRecv( session, req_id, 5 );
double end = get_timestamp_millis();
times[(4*i) + j] = end - start;
