From 485675d065b6c6802a65b07ba9ee9f19e7110daf Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Thu, 13 Oct 2016 19:21:37 +0300 Subject: [PATCH] Duplicate declarations removed Duplicate declarations of functions declared in maxscale/users.h and maxscale/gw.h removed and corresponding includes added instead. Unimplemented declaration removed. Further cleanup will be needed to ensure that functions etc. are declared in the right place. --- .../include/mysql_client_server_protocol.h | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/server/modules/include/mysql_client_server_protocol.h b/server/modules/include/mysql_client_server_protocol.h index 45a18f959..1dbc435b7 100644 --- a/server/modules/include/mysql_client_server_protocol.h +++ b/server/modules/include/mysql_client_server_protocol.h @@ -61,6 +61,8 @@ #include #include #include +#include +#include #include #define GW_MYSQL_VERSION "5.5.5-10.0.0 " MAXSCALE_VERSION "-maxscale" @@ -338,27 +340,8 @@ int mysql_send_auth_error ( int in_affected_rows, const char* mysql_message); -void gw_sha1_str(const uint8_t *in, int in_len, uint8_t *out); -void gw_sha1_2_str( - const uint8_t *in, - int in_len, - const uint8_t *in2, - int in2_len, - uint8_t *out); -void gw_str_xor( - uint8_t *output, - const uint8_t *input1, - const uint8_t *input2, - unsigned int len); - -char *gw_bin2hex(char *out, const uint8_t *in, unsigned int len); -int gw_hex2bin(uint8_t *out, const char *in, unsigned int len); -int gw_generate_random_str(char *output, int len); -int setnonblocking(int fd); -int setipaddress(struct in_addr *a, char *p); GWBUF* gw_MySQL_get_next_packet(GWBUF** p_readbuf); GWBUF* gw_MySQL_get_packets(GWBUF** p_readbuf, int* npackets); -GWBUF* gw_MySQL_discard_packets(GWBUF* buf, int npackets); void protocol_add_srv_command(MySQLProtocol* p, mysql_server_cmd_t cmd); void protocol_remove_srv_command(MySQLProtocol* p); bool protocol_waits_response(MySQLProtocol* p);