Merge remote-tracking branch 'freeradius/v3.0.x' into tr-upgrade

[freeradius.git] / src / modules / rlm_sql / drivers / rlm_sql_mysql / rlm_sql_mysql.c

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
index a6d4f76..820d36c 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
@@ -82,10 +82,8 @@ static const CONF_PARSER driver_config[] = {
 /* Prototypes */
 static sql_rcode_t sql_free_result(rlm_sql_handle_t*, rlm_sql_config_t*);
 
-static int sql_socket_destructor(void *c)
+static int _sql_socket_destructor(rlm_sql_mysql_conn_t *conn)
 {
-       rlm_sql_mysql_conn_t *conn = c;
-
        DEBUG2("rlm_sql_mysql: Socket destructor called, closing socket");
 
        if (conn->sock){
@@ -143,7 +141,7 @@ static sql_rcode_t sql_socket_init(rlm_sql_handle_t *handle, rlm_sql_config_t *c
        unsigned long sql_flags;
 
        MEM(conn = handle->conn = talloc_zero(handle, rlm_sql_mysql_conn_t));
-       talloc_set_destructor((void *) conn, sql_socket_destructor);
+       talloc_set_destructor(conn, _sql_socket_destructor);
 
        DEBUG("rlm_sql_mysql: Starting connect to MySQL server");