summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwangyunjian <wangyunjian@huawei.com>2020-07-26 23:13:56 +0800
committerJens Geyer <jensg@apache.org>2020-10-01 23:00:11 +0200
commitfa22f34e7466d0654dd207ab2e593c5337a1eac5 (patch)
tree02155522cdb8cddfa201fd903df83fa2c5b8346f
parent03f01fba18979128cc80cfc03ccdb0f4ffece47b (diff)
downloadthrift-fa22f34e7466d0654dd207ab2e593c5337a1eac5.tar.gz
THRIFT-5256: Fix some compile warnings
Client: c_glib Patch: wangyunjian This closes #2207 Signed-off-by: wangyunjian <wangyunjian@huawei.com>
-rw-r--r--lib/c_glib/src/thrift/c_glib/protocol/thrift_multiplexed_protocol.c2
-rw-r--r--lib/c_glib/src/thrift/c_glib/transport/thrift_ssl_socket.c4
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 5084ead47..38e3fd4b4 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 0835891b9..3778302c5 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) {