You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by je...@apache.org on 2020/03/15 11:21:17 UTC
[thrift] branch master updated: Fix several warnings in c_glib lib
and incorrect error message CLient: c_glib Patch: Kevin Wojniak
This is an automated email from the ASF dual-hosted git repository.
jensg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git
The following commit(s) were added to refs/heads/master by this push:
new dad2bf8 Fix several warnings in c_glib lib and incorrect error message CLient: c_glib Patch: Kevin Wojniak
dad2bf8 is described below
commit dad2bf87da9e46382b088544eba56b1829e25d92
Author: Kevin Wojniak <ka...@users.noreply.github.com>
AuthorDate: Fri Jul 5 03:42:02 2019 +0200
Fix several warnings in c_glib lib and incorrect error message
CLient: c_glib
Patch: Kevin Wojniak
This closes #1830
---
lib/c_glib/src/thrift/c_glib/transport/thrift_server_socket.c | 2 +-
lib/c_glib/src/thrift/c_glib/transport/thrift_ssl_socket.c | 6 +-----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/lib/c_glib/src/thrift/c_glib/transport/thrift_server_socket.c b/lib/c_glib/src/thrift/c_glib/transport/thrift_server_socket.c
index 92c6d7f..438b38d 100644
--- a/lib/c_glib/src/thrift/c_glib/transport/thrift_server_socket.c
+++ b/lib/c_glib/src/thrift/c_glib/transport/thrift_server_socket.c
@@ -115,7 +115,7 @@ thrift_server_socket_listen (ThriftServerTransport *transport, GError **error)
{
g_set_error (error, THRIFT_SERVER_SOCKET_ERROR,
THRIFT_SERVER_SOCKET_ERROR_BIND,
- "failed to bind to path %s: - %s",
+ "failed to listen to path %s: - %s",
tsocket->path, strerror(errno));
return FALSE;
}
diff --git a/lib/c_glib/src/thrift/c_glib/transport/thrift_ssl_socket.c b/lib/c_glib/src/thrift/c_glib/transport/thrift_ssl_socket.c
index a41e9c6..216da44 100644
--- a/lib/c_glib/src/thrift/c_glib/transport/thrift_ssl_socket.c
+++ b/lib/c_glib/src/thrift/c_glib/transport/thrift_ssl_socket.c
@@ -270,13 +270,9 @@ thrift_ssl_socket_open (ThriftTransport *transport, GError **error)
gboolean
thrift_ssl_socket_close (ThriftTransport *transport, GError **error)
{
- gboolean retval = FALSE;
ThriftSSLSocket *ssl_socket = THRIFT_SSL_SOCKET(transport);
if(ssl_socket!=NULL && ssl_socket->ssl) {
- int rc = SSL_shutdown(ssl_socket->ssl);
-/* if (rc < 0) {
- int errno_copy = THRIFT_SSL_SOCKET_ERROR_SSL;
- }*/
+ SSL_shutdown(ssl_socket->ssl);
SSL_free(ssl_socket->ssl);
ssl_socket->ssl = NULL;
ERR_remove_state(0);