From: miker Date: Mon, 21 May 2007 01:53:27 +0000 (+0000) Subject: reordering breakage; const qualifier in header X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=9936280b15ff19472e0b9036fac935e2cd176a03;p=Evergreen.git reordering breakage; const qualifier in header git-svn-id: svn://svn.open-ils.org/ILS/trunk@7347 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/OpenSRF/src/libstack/osrf_system.c b/OpenSRF/src/libstack/osrf_system.c index 7680bba7a4..fcc17d2b83 100644 --- a/OpenSRF/src/libstack/osrf_system.c +++ b/OpenSRF/src/libstack/osrf_system.c @@ -179,7 +179,6 @@ int osrf_system_bootstrap_client_resc( char* config_file, char* contextnode, cha free(unixpath); free(facility); free(actlog); - free(domain); return -1; } @@ -270,7 +269,6 @@ int osrf_system_bootstrap_client_resc( char* config_file, char* contextnode, cha free(password); free(port); free(unixpath); - free(domain); if(__osrfGlobalTransportClient) return 1; diff --git a/OpenSRF/src/libtransport/transport_client.h b/OpenSRF/src/libtransport/transport_client.h index aa0b921526..50a2c66264 100644 --- a/OpenSRF/src/libtransport/transport_client.h +++ b/OpenSRF/src/libtransport/transport_client.h @@ -42,7 +42,7 @@ typedef struct transport_client_struct transport_client; // if port > 0 => connect via TCP // else if unix_path != NULL => connect via UNIX socket // --------------------------------------------------------------------------- -transport_client* client_init( char* server, int port, char* unix_path, int component ); +transport_client* client_init( const char* server, int port, const char* unix_path, int component ); // --------------------------------------------------------------------------- diff --git a/OpenSRF/src/libtransport/transport_session.h b/OpenSRF/src/libtransport/transport_session.h index ba02e5bfa1..78d108b421 100644 --- a/OpenSRF/src/libtransport/transport_session.h +++ b/OpenSRF/src/libtransport/transport_session.h @@ -186,8 +186,8 @@ typedef struct transport_session_struct transport_session; // If port > 0, then this session uses TCP connection. Otherwise, // if unix_path != NULL, it uses a UNIX domain socket. // ------------------------------------------------------------------ -transport_session* init_transport( char* server, int port, - char* unix_path, void* user_data, int component ); +transport_session* init_transport( const char* server, int port, + const char* unix_path, void* user_data, int component ); // ------------------------------------------------------------------ // Returns the value of the given XML attribute