From a839c5586f1ab1cc541a5aa48648f16130bc437b Mon Sep 17 00:00:00 2001 From: erickson Date: Fri, 5 Aug 2005 12:34:31 +0000 Subject: [PATCH] removed some unused comments, etc. git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@465 9efc2488-bf62-4759-914b-345cdb29e865 --- src/libtransport/transport_client.c | 2 ++ src/libtransport/transport_client.h | 2 ++ src/libtransport/transport_session.c | 13 ++----------- src/libtransport/transport_socket.c | 10 ---------- 4 files changed, 6 insertions(+), 21 deletions(-) diff --git a/src/libtransport/transport_client.c b/src/libtransport/transport_client.c index 3ab5fa5..b7b3b9e 100644 --- a/src/libtransport/transport_client.c +++ b/src/libtransport/transport_client.c @@ -70,6 +70,7 @@ transport_client* client_init( char* server, int port, int component ) { return client; } + int client_connect( transport_client* client, char* username, char* password, char* resource, int connect_timeout, enum TRANSPORT_AUTH_TYPE auth_type ) { @@ -78,6 +79,7 @@ int client_connect( transport_client* client, password, resource, connect_timeout, auth_type ); } + int client_disconnect( transport_client* client ) { if( client == NULL ) { return 0; } return session_disconnect( client->session ); diff --git a/src/libtransport/transport_client.h b/src/libtransport/transport_client.h index 837e2f7..6e5f4ec 100644 --- a/src/libtransport/transport_client.h +++ b/src/libtransport/transport_client.h @@ -41,6 +41,7 @@ typedef struct transport_client_struct transport_client; // --------------------------------------------------------------------------- transport_client* client_init( char* server, int port, int component ); + // --------------------------------------------------------------------------- // Connects to the Jabber server with the provided information. Returns 1 on // success, 0 otherwise. @@ -49,6 +50,7 @@ int client_connect( transport_client* client, char* username, char* password, char* resource, int connect_timeout, enum TRANSPORT_AUTH_TYPE auth_type ); + int client_disconnect( transport_client* client ); // --------------------------------------------------------------------------- diff --git a/src/libtransport/transport_session.c b/src/libtransport/transport_session.c index c2d0d33..f67b4e5 100644 --- a/src/libtransport/transport_session.c +++ b/src/libtransport/transport_session.c @@ -33,7 +33,6 @@ transport_session* init_transport( char* server, int port, void* user_data, int session->router_command_buffer = buffer_init( JABBER_JID_BUFSIZE ); - if( session->body_buffer == NULL || session->subject_buffer == NULL || session->thread_buffer == NULL || session->from_buffer == NULL || session->status_buffer == NULL || session->recipient_buffer == NULL || @@ -66,6 +65,8 @@ transport_session* init_transport( char* server, int port, void* user_data, int return session; } + + /* XXX FREE THE BUFFERS */ int session_free( transport_session* session ) { if( ! session ) { return 0; } @@ -143,16 +144,6 @@ int session_connect( transport_session* session, } - /* - session->state_machine->connected = - tcp_connected( session->sock_obj ); - - if( session->state_machine->connected ) { - return 1; - } - */ - - char* server = session->sock_obj->server; if( ! session->sock_obj ) { diff --git a/src/libtransport/transport_socket.c b/src/libtransport/transport_socket.c index 893f743..a2cbb15 100644 --- a/src/libtransport/transport_socket.c +++ b/src/libtransport/transport_socket.c @@ -44,16 +44,6 @@ int tcp_connect( transport_socket* sock_obj ){ struct hostent *hptr; int sock_fd; - #ifdef WIN32 - WSADATA data; - char bfr; - if( WSAStartup(MAKEWORD(1,1), &data) ) { - fatal_handler( "somethin's broke with windows socket startup" ); - return -1; - } - #endif - - // ------------------------------------------------------------------ // Create the socket // ------------------------------------------------------------------ -- 2.11.0