[thrift] branch master updated: THRIFT-5256: Fix some compile warnings Client: c_glib Patch: wangyunjian

[jensg]

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 fa22f34  THRIFT-5256: Fix some compile warnings Client: c_glib Patch: 
wangyunjian
fa22f34 is described below

commit fa22f34e7466d0654dd207ab2e593c5337a1eac5
Author: wangyunjian <wangyunj...@huawei.com>
AuthorDate: Sun Jul 26 23:13:56 2020 +0800

    THRIFT-5256: Fix some compile warnings
    Client: c_glib
    Patch: wangyunjian
    
    This closes #2207
    
    Signed-off-by: wangyunjian <wangyunj...@huawei.com>
---
 lib/c_glib/src/thrift/c_glib/protocol/thrift_multiplexed_protocol.c | 2 +-
 lib/c_glib/src/thrift/c_glib/transport/thrift_ssl_socket.c          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/lib/c_glib/src/thrift/c_glib/protocol/thrift_multiplexed_protocol.c 
b/lib/c_glib/src/thrift/c_glib/protocol/thrift_multiplexed_protocol.c
index 5084ead..38e3fd4 100644
--- a/lib/c_glib/src/thrift/c_glib/protocol/thrift_multiplexed_protocol.c
+++ b/lib/c_glib/src/thrift/c_glib/protocol/thrift_multiplexed_protocol.c
@@ -40,7 +40,7 @@ G_DEFINE_TYPE(ThriftMultiplexedProtocol, 
thrift_multiplexed_protocol, THRIFT_TYP
 static GParamSpec 
*thrift_multiplexed_protocol_obj_properties[PROP_THRIFT_MULTIPLEXED_PROTOCOL_END]
 = { NULL, };
 
 gint32
-thrift_multiplexed_protocol_write_message_begin (ThriftMultiplexedProtocol 
*protocol,
+thrift_multiplexed_protocol_write_message_begin (ThriftProtocol *protocol,
     const gchar *name, const ThriftMessageType message_type,
     const gint32 seqid, GError **error)
 {
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 0835891..3778302 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
@@ -159,7 +159,7 @@ G_DEFINE_TYPE(ThriftSSLSocket, thrift_ssl_socket, 
THRIFT_TYPE_SOCKET)
  * @param error
  */
 static
-void thrift_ssl_socket_get_ssl_error(ThriftSSLSocket *socket, const guchar 
*error_msg, guint thrift_error_no, int ssl_error, GError **error)
+void thrift_ssl_socket_get_ssl_error(ThriftSSLSocket *socket, const gchar 
*error_msg, guint thrift_error_no, int ssl_error, GError **error)
 {
   unsigned long error_code;
   char buffer[1024];
@@ -207,7 +207,7 @@ void thrift_ssl_socket_get_ssl_error(ThriftSSLSocket 
*socket, const guchar *erro
  * @param error
  */
 static
-void thrift_ssl_socket_get_error(const guchar *error_msg, guint 
thrift_error_no, GError **error)
+void thrift_ssl_socket_get_error(const gchar *error_msg, guint 
thrift_error_no, GError **error)
 {
   unsigned long error_code;
   while ((error_code = ERR_get_error()) != 0) {