diff options
-rw-r--r-- | librabbitmq/amqp.h | 15 | ||||
-rw-r--r-- | librabbitmq/amqp_openssl.c | 14 | ||||
-rw-r--r-- | librabbitmq/amqp_socket.c | 8 | ||||
-rw-r--r-- | librabbitmq/amqp_socket.h | 2 | ||||
-rw-r--r-- | librabbitmq/amqp_tcp_socket.c | 8 |
5 files changed, 0 insertions, 47 deletions
diff --git a/librabbitmq/amqp.h b/librabbitmq/amqp.h index 704e9fc..45e1542 100644 --- a/librabbitmq/amqp.h +++ b/librabbitmq/amqp.h @@ -670,21 +670,6 @@ AMQP_CALL amqp_socket_open(amqp_socket_t *self, const char *host, int port); /** - * Retrieve an error code for the last socket operation. - * - * At the time of writing, this interface is not well supported and is subject - * to changes! - * - * \param [in,out] self A socket object. - * - * \return Zero upon success, an opaque error code otherwise - */ -AMQP_PUBLIC_FUNCTION -int -AMQP_CALL -amqp_socket_error(amqp_socket_t *self); - -/** * Get the socket descriptor in use by a socket object. * * Retrieve the underlying socket descriptor. This function can be used to diff --git a/librabbitmq/amqp_openssl.c b/librabbitmq/amqp_openssl.c index cf0fc5b..f3cf379 100644 --- a/librabbitmq/amqp_openssl.c +++ b/librabbitmq/amqp_openssl.c @@ -319,19 +319,6 @@ amqp_ssl_socket_close(void *base) } static int -amqp_ssl_socket_error(void *base) -{ - struct amqp_ssl_socket_t *self = (struct amqp_ssl_socket_t *)base; - return self->internal_error; -} - -char * -amqp_ssl_error_string(AMQP_UNUSED int err) -{ - return strdup("A ssl socket error occurred."); -} - -static int amqp_ssl_socket_get_sockfd(void *base) { struct amqp_ssl_socket_t *self = (struct amqp_ssl_socket_t *)base; @@ -359,7 +346,6 @@ static const struct amqp_socket_class_t amqp_ssl_socket_class = { amqp_ssl_socket_recv, /* recv */ amqp_ssl_socket_open, /* open */ amqp_ssl_socket_close, /* close */ - amqp_ssl_socket_error, /* error */ amqp_ssl_socket_get_sockfd, /* get_sockfd */ amqp_ssl_socket_delete /* delete */ }; diff --git a/librabbitmq/amqp_socket.c b/librabbitmq/amqp_socket.c index 575189f..fa37201 100644 --- a/librabbitmq/amqp_socket.c +++ b/librabbitmq/amqp_socket.c @@ -203,14 +203,6 @@ amqp_socket_delete(amqp_socket_t *self) } int -amqp_socket_error(amqp_socket_t *self) -{ - assert(self); - assert(self->klass->error); - return self->klass->error(self); -} - -int amqp_socket_get_sockfd(amqp_socket_t *self) { assert(self); diff --git a/librabbitmq/amqp_socket.h b/librabbitmq/amqp_socket.h index e0a1b85..48910ec 100644 --- a/librabbitmq/amqp_socket.h +++ b/librabbitmq/amqp_socket.h @@ -48,7 +48,6 @@ typedef ssize_t (*amqp_socket_send_fn)(void *, const void *, size_t); typedef ssize_t (*amqp_socket_recv_fn)(void *, void *, size_t, int); typedef int (*amqp_socket_open_fn)(void *, const char *, int); typedef int (*amqp_socket_close_fn)(void *); -typedef int (*amqp_socket_error_fn)(void *); typedef int (*amqp_socket_get_sockfd_fn)(void *); typedef void (*amqp_socket_delete_fn)(void *); @@ -59,7 +58,6 @@ struct amqp_socket_class_t { amqp_socket_recv_fn recv; amqp_socket_open_fn open; amqp_socket_close_fn close; - amqp_socket_error_fn error; amqp_socket_get_sockfd_fn get_sockfd; amqp_socket_delete_fn delete; }; diff --git a/librabbitmq/amqp_tcp_socket.c b/librabbitmq/amqp_tcp_socket.c index 5eae027..6ab71ef 100644 --- a/librabbitmq/amqp_tcp_socket.c +++ b/librabbitmq/amqp_tcp_socket.c @@ -248,13 +248,6 @@ amqp_tcp_socket_close(void *base) } static int -amqp_tcp_socket_error(AMQP_UNUSED void *base) -{ - struct amqp_tcp_socket_t *self = (struct amqp_tcp_socket_t *)base; - return self->internal_error; -} - -static int amqp_tcp_socket_get_sockfd(void *base) { struct amqp_tcp_socket_t *self = (struct amqp_tcp_socket_t *)base; @@ -279,7 +272,6 @@ static const struct amqp_socket_class_t amqp_tcp_socket_class = { amqp_tcp_socket_recv, /* recv */ amqp_tcp_socket_open, /* open */ amqp_tcp_socket_close, /* close */ - amqp_tcp_socket_error, /* error */ amqp_tcp_socket_get_sockfd, /* get_sockfd */ amqp_tcp_socket_delete /* delete */ }; |