diff --git a/src/apps/common/ns_turn_utils.c b/src/apps/common/ns_turn_utils.c index c51bc6b4..4791200f 100644 --- a/src/apps/common/ns_turn_utils.c +++ b/src/apps/common/ns_turn_utils.c @@ -828,16 +828,6 @@ void turn_free_func(void *ptr, size_t sz, const char* function, int line) { free(ptr); } -extern "C" void turn_free_simple(void *ptr); -void turn_free_simple(void *ptr) { - - tm_init(); - - del_tm_ptr(ptr,__FUNCTION__); - - free(ptr); -} - extern "C" void *turn_calloc_func(size_t number, size_t size, const char* function, int line); void *turn_calloc_func(size_t number, size_t size, const char* function, int line) { diff --git a/src/apps/relay/dbdrivers/dbd_mongo.c b/src/apps/relay/dbdrivers/dbd_mongo.c index 95ba28dd..7faf1471 100644 --- a/src/apps/relay/dbdrivers/dbd_mongo.c +++ b/src/apps/relay/dbdrivers/dbd_mongo.c @@ -1089,7 +1089,7 @@ static void mongo_reread_realms(secrets_list_t * realms_list) { TURN_LOG_FUNC(TURN_LOG_LEVEL_ERROR, "Error querying MongoDB collection 'realm'\n"); } else { - ur_string_map *o_to_realm_new = ur_string_map_create(turn_free_simple); + ur_string_map *o_to_realm_new = ur_string_map_create(free); const bson_t * item; uint32_t length; diff --git a/src/apps/relay/dbdrivers/dbd_mysql.c b/src/apps/relay/dbdrivers/dbd_mysql.c index d54542a6..7bfc7321 100644 --- a/src/apps/relay/dbdrivers/dbd_mysql.c +++ b/src/apps/relay/dbdrivers/dbd_mysql.c @@ -1031,7 +1031,7 @@ static void mysql_reread_realms(secrets_list_t * realms_list) { MYSQL_RES *mres = mysql_store_result(myc); if(mres && mysql_field_count(myc)==2) { - ur_string_map *o_to_realm_new = ur_string_map_create(turn_free_simple); + ur_string_map *o_to_realm_new = ur_string_map_create(free); for(;;) { MYSQL_ROW row = mysql_fetch_row(mres); diff --git a/src/apps/relay/dbdrivers/dbd_pgsql.c b/src/apps/relay/dbdrivers/dbd_pgsql.c index 2393e984..0041caed 100644 --- a/src/apps/relay/dbdrivers/dbd_pgsql.c +++ b/src/apps/relay/dbdrivers/dbd_pgsql.c @@ -748,7 +748,7 @@ static void pgsql_reread_realms(secrets_list_t * realms_list) { if(res && (PQresultStatus(res) == PGRES_TUPLES_OK)) { - ur_string_map *o_to_realm_new = ur_string_map_create(turn_free_simple); + ur_string_map *o_to_realm_new = ur_string_map_create(free); int i = 0; for(i=0;i