From ed91d4bc17efceba1544207cbf02c08021c04301 Mon Sep 17 00:00:00 2001
From: "Bradley T. Hughes" <bradleythughes@fastmail.fm>
Date: Wed, 6 Mar 2019 23:34:25 +0100
Subject: [PATCH] Remove turn_free_simple

Do not overload free() from stdlib.h
---
 src/apps/common/ns_turn_utils.c       | 10 ----------
 src/apps/relay/dbdrivers/dbd_mongo.c  |  2 +-
 src/apps/relay/dbdrivers/dbd_mysql.c  |  2 +-
 src/apps/relay/dbdrivers/dbd_pgsql.c  |  2 +-
 src/apps/relay/dbdrivers/dbd_redis.c  |  2 +-
 src/apps/relay/dbdrivers/dbd_sqlite.c |  2 +-
 src/apps/relay/mainrelay.c            |  2 +-
 src/apps/relay/userdb.c               |  2 +-
 src/ns_turn_defs.h                    |  2 --
 9 files changed, 7 insertions(+), 19 deletions(-)

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<PQntuples(res);i++) {
diff --git a/src/apps/relay/dbdrivers/dbd_redis.c b/src/apps/relay/dbdrivers/dbd_redis.c
index 3b0f6322..59944a6f 100644
--- a/src/apps/relay/dbdrivers/dbd_redis.c
+++ b/src/apps/relay/dbdrivers/dbd_redis.c
@@ -1124,7 +1124,7 @@ static void redis_reread_realms(secrets_list_t * realms_list) {
 		redisReply *reply = (redisReply*) redisCommand(rc, "keys turn/origin/*");
 		if (reply) {
 
-			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);
 
 			secrets_list_t keys;
 
diff --git a/src/apps/relay/dbdrivers/dbd_sqlite.c b/src/apps/relay/dbdrivers/dbd_sqlite.c
index 28f236d8..fdcd4f2b 100644
--- a/src/apps/relay/dbdrivers/dbd_sqlite.c
+++ b/src/apps/relay/dbdrivers/dbd_sqlite.c
@@ -1027,7 +1027,7 @@ static void sqlite_reread_realms(secrets_list_t * realms_list)
 
 			if ((rc = sqlite3_prepare(sqliteconnection, statement, -1, &st, 0)) == SQLITE_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);
 
 				while (1) {
 					int res = sqlite3_step(st);
diff --git a/src/apps/relay/mainrelay.c b/src/apps/relay/mainrelay.c
index db99fa36..964f86f5 100644
--- a/src/apps/relay/mainrelay.c
+++ b/src/apps/relay/mainrelay.c
@@ -2154,7 +2154,7 @@ int main(int argc, char **argv)
 #endif
 
 	ns_bzero(&turn_params.default_users_db,sizeof(default_users_db_t));
-	turn_params.default_users_db.ram_db.static_accounts = ur_string_map_create(turn_free_simple);
+	turn_params.default_users_db.ram_db.static_accounts = ur_string_map_create(free);
 
 	if(strstr(argv[0],"turnadmin"))
 		return adminmain(argc,argv);
diff --git a/src/apps/relay/userdb.c b/src/apps/relay/userdb.c
index cb7f219d..48b8df7c 100644
--- a/src/apps/relay/userdb.c
+++ b/src/apps/relay/userdb.c
@@ -105,7 +105,7 @@ void create_default_realm()
 	/* init everything: */
 	TURN_MUTEX_INIT_RECURSIVE(&o_to_realm_mutex);
 	init_secrets_list(&realms_list);
-	o_to_realm = ur_string_map_create(turn_free_simple);
+	o_to_realm = ur_string_map_create(free);
 	default_realm_params_ptr = &_default_realm_params;
 	realms = ur_string_map_create(NULL);
 	lock_realms();
diff --git a/src/ns_turn_defs.h b/src/ns_turn_defs.h
index 6ef98725..df8d12f2 100644
--- a/src/ns_turn_defs.h
+++ b/src/ns_turn_defs.h
@@ -121,7 +121,6 @@ static inline u64bits _ioa_ntoh64(u64bits v)
   void *turn_malloc_func(size_t sz, const char* function, int line);
   void *turn_realloc_func(void *ptr, size_t old_sz, size_t new_sz, const char* function, int line);
   void turn_free_func(void *ptr, size_t sz, const char* function, int line);
-  void turn_free_simple(void *ptr);
   void *turn_calloc_func(size_t number, size_t size, const char* function, int line);
   char *turn_strdup_func(const char* s, const char* function, int line);
   void* debug_ptr_add_func(void *ptr, const char* function, int line);
@@ -148,7 +147,6 @@ static inline u64bits _ioa_ntoh64(u64bits v)
 #define turn_realloc(ptr, old_sz, new_sz) realloc((ptr),(size_t)(new_sz))
 #define turn_calloc(number, sz) calloc((number),(size_t)(sz))
 #define turn_strdup(s) strdup((s))
-#define turn_free_simple free
 
 #define SSL_NEW(ctx) SSL_new(ctx)