Remove turn_strdup()

Do not overload strdup() from string.h

src/apps/common/apputils.c

@@ -760,7 +760,7 @@ void set_execdir(void)
   /* On some systems, this may give us the execution path */
   char *_var = getenv("_");
   if(_var && *_var) {
-    _var = turn_strdup(_var);
+    _var = strdup(_var);
     char *edir=_var;
     if(edir[0]!='.') 
       edir = strstr(edir,"/");
@@ -770,7 +770,7 @@ void set_execdir(void)
       edir = dirname(_var);
     if(c_execdir)
       free(c_execdir);
-    c_execdir = turn_strdup(edir);
+    c_execdir = strdup(edir);
     free(_var);
   }
 }
@@ -815,7 +815,7 @@ char* find_config_file(const char *config_file, int print_file_name)
 			FILE *f = fopen(config_file, "r");
 			if (f) {
 				fclose(f);
-				full_path_to_config_file = turn_strdup(config_file);
+				full_path_to_config_file = strdup(config_file);
 			}
 		} else {
 			int i = 0;

src/apps/common/hiredis_libevent2.c

@@ -252,10 +252,10 @@ redis_context_handle redisLibeventAttach(struct event_base *base, char *ip0, int
   e->allocated = 1;
   e->context = ac;
   e->base = base;
-  e->ip = turn_strdup(ip);
+  e->ip = strdup(ip);
   e->port = port;
   if(pwd)
-	  e->pwd = turn_strdup(pwd);
+	  e->pwd = strdup(pwd);
   e->db = db;
 
   /* Register functions to start/stop listening for events */

src/apps/common/ns_turn_utils.c

@@ -296,11 +296,11 @@ static void set_log_file_name_func(char *base, char *f, size_t fsz)
 	}
 
 	char logdate[125];
-	char *tail=turn_strdup(".log");
+	char *tail=strdup(".log");
 
 	get_date(logdate,sizeof(logdate));
 
-	char *base1=turn_strdup(base);
+	char *base1=strdup(base);
 
 	int len=(int)strlen(base1);
 
@@ -320,11 +320,11 @@ static void set_log_file_name_func(char *base, char *f, size_t fsz)
 			break;
 		else if(base1[len]=='.') {
 			free(tail);
-			tail=turn_strdup(base1+len);
+			tail=strdup(base1+len);
 			base1[len]=0;
 			if(strlen(tail)<2) {
 				free(tail);
-				tail = turn_strdup(".log");
+				tail = strdup(".log");
 			}
 			break;
 		}
@@ -787,18 +787,6 @@ void tm_print_func(void) {
   pthread_mutex_unlock(&tm);
 } 
 
-extern "C" char *turn_strdup_func(const char* s, const char* function, int line);
-char *turn_strdup_func(const char* s, const char* function, int line) {
-
-  TM_START();
-
-  char *ptr = strdup(s);
-
-  add_tm_ptr(ptr,id);
-
-  return ptr;
-}
-
 #endif
 #endif
 
@@ -808,7 +796,7 @@ int is_secure_string(const u08bits *string, int sanitizesql)
 {
 	int ret = 0;
 	if(string) {
-		unsigned char *s0 = (unsigned char*)turn_strdup((const char*)string);
+		unsigned char *s0 = (unsigned char*)strdup((const char*)string);
 		unsigned char *s = s0;
 		while(*s) {
 			*s = (unsigned char)tolower((int)*s);

src/apps/relay/dbdrivers/dbd_mongo.c

@@ -1100,7 +1100,7 @@ static void mongo_reread_realms(secrets_list_t * realms_list) {
 			if (bson_iter_init(&iter, item) && bson_iter_find(&iter, "realm")
 					&& BSON_ITER_HOLDS_UTF8(&iter)) {
 
-				char * _realm = turn_strdup(bson_iter_utf8(&iter, &length));
+				char * _realm = strdup(bson_iter_utf8(&iter, &length));
 
 				get_realm(_realm);
 
@@ -1117,8 +1117,8 @@ static void mongo_reread_realms(secrets_list_t * realms_list) {
 					if (bson_iter_init(&origin_iter, &origin_array)) {
 						while (bson_iter_next(&origin_iter)) {
 							if (BSON_ITER_HOLDS_UTF8(&origin_iter)) {
-								char* _origin =	turn_strdup(bson_iter_utf8(&origin_iter, &length));
-								char *rval = turn_strdup(_realm);
+								char* _origin =	strdup(bson_iter_utf8(&origin_iter, &length));
+								char *rval = strdup(_realm);
 								ur_string_map_value_type value =
 										(ur_string_map_value_type) (rval);
 								ur_string_map_put(o_to_realm_new,

src/apps/relay/dbdrivers/dbd_mysql.c

@@ -106,7 +106,7 @@ static Myconninfo *MyconninfoParse(char *userdb, char **errmsg) {
 	Myconninfo *co = (Myconninfo*)malloc(sizeof(Myconninfo));
 	ns_bzero(co,sizeof(Myconninfo));
 	if(userdb) {
-		char *s0=turn_strdup(userdb);
+		char *s0=strdup(userdb);
 		char *s = s0;
 
 		while(s && *s) {
@@ -123,44 +123,44 @@ static Myconninfo *MyconninfoParse(char *userdb, char **errmsg) {
 				MyconninfoFree(co);
 				co = NULL;
 				if(errmsg) {
-					*errmsg = turn_strdup(s);
+					*errmsg = strdup(s);
 				}
 				break;
 			}
 
 			*seq = 0;
 			if(!strcmp(s,"host"))
-				co->host = turn_strdup(seq+1);
+				co->host = strdup(seq+1);
 			else if(!strcmp(s,"ip"))
-				co->host = turn_strdup(seq+1);
+				co->host = strdup(seq+1);
 			else if(!strcmp(s,"addr"))
-				co->host = turn_strdup(seq+1);
+				co->host = strdup(seq+1);
 			else if(!strcmp(s,"ipaddr"))
-				co->host = turn_strdup(seq+1);
+				co->host = strdup(seq+1);
 			else if(!strcmp(s,"hostaddr"))
-				co->host = turn_strdup(seq+1);
+				co->host = strdup(seq+1);
 			else if(!strcmp(s,"dbname"))
-				co->dbname = turn_strdup(seq+1);
+				co->dbname = strdup(seq+1);
 			else if(!strcmp(s,"db"))
-				co->dbname = turn_strdup(seq+1);
+				co->dbname = strdup(seq+1);
 			else if(!strcmp(s,"database"))
-				co->dbname = turn_strdup(seq+1);
+				co->dbname = strdup(seq+1);
 			else if(!strcmp(s,"user"))
-				co->user = turn_strdup(seq+1);
+				co->user = strdup(seq+1);
 			else if(!strcmp(s,"uname"))
-				co->user = turn_strdup(seq+1);
+				co->user = strdup(seq+1);
 			else if(!strcmp(s,"name"))
-				co->user = turn_strdup(seq+1);
+				co->user = strdup(seq+1);
 			else if(!strcmp(s,"username"))
-				co->user = turn_strdup(seq+1);
+				co->user = strdup(seq+1);
 			else if(!strcmp(s,"password"))
-				co->password = turn_strdup(seq+1);
+				co->password = strdup(seq+1);
 			else if(!strcmp(s,"pwd"))
-				co->password = turn_strdup(seq+1);
+				co->password = strdup(seq+1);
 			else if(!strcmp(s,"passwd"))
-				co->password = turn_strdup(seq+1);
+				co->password = strdup(seq+1);
 			else if(!strcmp(s,"secret"))
-				co->password = turn_strdup(seq+1);
+				co->password = strdup(seq+1);
 			else if(!strcmp(s,"port"))
 				co->port = (unsigned int)atoi(seq+1);
 			else if(!strcmp(s,"p"))
@@ -172,30 +172,30 @@ static Myconninfo *MyconninfoParse(char *userdb, char **errmsg) {
 			else if(!strcmp(s,"read_timeout"))
 				co->read_timeout = (unsigned int)atoi(seq+1);
 			else if(!strcmp(s,"key"))
-				co->key = turn_strdup(seq+1);
+				co->key = strdup(seq+1);
 			else if(!strcmp(s,"ssl-key"))
-				co->key = turn_strdup(seq+1);
+				co->key = strdup(seq+1);
 			else if(!strcmp(s,"ca"))
-				co->ca = turn_strdup(seq+1);
+				co->ca = strdup(seq+1);
 			else if(!strcmp(s,"ssl-ca"))
-				co->ca = turn_strdup(seq+1);
+				co->ca = strdup(seq+1);
 			else if(!strcmp(s,"capath"))
-				co->capath = turn_strdup(seq+1);
+				co->capath = strdup(seq+1);
 			else if(!strcmp(s,"ssl-capath"))
-				co->capath = turn_strdup(seq+1);
+				co->capath = strdup(seq+1);
 			else if(!strcmp(s,"cert"))
-				co->cert = turn_strdup(seq+1);
+				co->cert = strdup(seq+1);
 			else if(!strcmp(s,"ssl-cert"))
-				co->cert = turn_strdup(seq+1);
+				co->cert = strdup(seq+1);
 			else if(!strcmp(s,"cipher"))
-				co->cipher = turn_strdup(seq+1);
+				co->cipher = strdup(seq+1);
 			else if(!strcmp(s,"ssl-cipher"))
-				co->cipher = turn_strdup(seq+1);
+				co->cipher = strdup(seq+1);
 			else {
 				MyconninfoFree(co);
 				co = NULL;
 				if(errmsg) {
-					*errmsg = turn_strdup(s);
+					*errmsg = strdup(s);
 				}
 				break;
 			}
@@ -208,13 +208,13 @@ static Myconninfo *MyconninfoParse(char *userdb, char **errmsg) {
 
 	if(co) {
 		if(!(co->dbname))
-			co->dbname=turn_strdup("0");
+			co->dbname=strdup("0");
 		if(!(co->host))
-			co->host=turn_strdup("127.0.0.1");
+			co->host=strdup("127.0.0.1");
 		if(!(co->user))
-			co->user=turn_strdup("");
+			co->user=strdup("");
 		if(!(co->password))
-			co->password=turn_strdup("");
+			co->password=strdup("");
 	}
 
 	return co;
@@ -1045,7 +1045,7 @@ static void mysql_reread_realms(secrets_list_t * realms_list) {
 									char oval[513];
 									ns_bcopy(row[0],oval,sz);
 									oval[sz]=0;
-									char *rval=turn_strdup(row[1]);
+									char *rval=strdup(row[1]);
 									get_realm(rval);
 									ur_string_map_value_type value = (ur_string_map_value_type)rval;
 									ur_string_map_put(o_to_realm_new, (const ur_string_map_key_type) oval, value);

src/apps/relay/dbdrivers/dbd_pgsql.c

@@ -757,7 +757,7 @@ static void pgsql_reread_realms(secrets_list_t * realms_list) {
 						char *rval = PQgetvalue(res,i,1);
 						if(rval) {
 							get_realm(rval);
-							ur_string_map_value_type value = turn_strdup(rval);
+							ur_string_map_value_type value = strdup(rval);
 							ur_string_map_put(o_to_realm_new, (const ur_string_map_key_type) oval, value);
 						}
 					}

src/apps/relay/dbdrivers/dbd_redis.c

@@ -69,7 +69,7 @@ static Ryconninfo *RyconninfoParse(const char *userdb, char **errmsg) {
 	Ryconninfo *co = (Ryconninfo*) malloc(sizeof(Ryconninfo));
 	ns_bzero(co,sizeof(Ryconninfo));
 	if (userdb) {
-		char *s0 = turn_strdup(userdb);
+		char *s0 = strdup(userdb);
 		char *s = s0;
 
 		while (s && *s) {
@@ -87,28 +87,28 @@ static Ryconninfo *RyconninfoParse(const char *userdb, char **errmsg) {
 				RyconninfoFree(co);
 				co = NULL;
 				if (errmsg) {
-					*errmsg = turn_strdup(s);
+					*errmsg = strdup(s);
 				}
 				break;
 			}
 
 			*seq = 0;
 			if (!strcmp(s, "host"))
-				co->host = turn_strdup(seq + 1);
+				co->host = strdup(seq + 1);
 			else if (!strcmp(s, "ip"))
-				co->host = turn_strdup(seq + 1);
+				co->host = strdup(seq + 1);
 			else if (!strcmp(s, "addr"))
-				co->host = turn_strdup(seq + 1);
+				co->host = strdup(seq + 1);
 			else if (!strcmp(s, "ipaddr"))
-				co->host = turn_strdup(seq + 1);
+				co->host = strdup(seq + 1);
 			else if (!strcmp(s, "hostaddr"))
-				co->host = turn_strdup(seq + 1);
+				co->host = strdup(seq + 1);
 			else if (!strcmp(s, "dbname"))
-				co->dbname = turn_strdup(seq + 1);
+				co->dbname = strdup(seq + 1);
 			else if (!strcmp(s, "db"))
-				co->dbname = turn_strdup(seq + 1);
+				co->dbname = strdup(seq + 1);
 			else if (!strcmp(s, "database"))
-				co->dbname = turn_strdup(seq + 1);
+				co->dbname = strdup(seq + 1);
 			else if (!strcmp(s, "user"))
 				;
 			else if (!strcmp(s, "uname"))
@@ -118,13 +118,13 @@ static Ryconninfo *RyconninfoParse(const char *userdb, char **errmsg) {
 			else if (!strcmp(s, "username"))
 				;
 			else if (!strcmp(s, "password"))
-				co->password = turn_strdup(seq + 1);
+				co->password = strdup(seq + 1);
 			else if (!strcmp(s, "pwd"))
-				co->password = turn_strdup(seq + 1);
+				co->password = strdup(seq + 1);
 			else if (!strcmp(s, "passwd"))
-				co->password = turn_strdup(seq + 1);
+				co->password = strdup(seq + 1);
 			else if (!strcmp(s, "secret"))
-				co->password = turn_strdup(seq + 1);
+				co->password = strdup(seq + 1);
 			else if (!strcmp(s, "port"))
 				co->port = (unsigned int) atoi(seq + 1);
 			else if (!strcmp(s, "p"))
@@ -137,7 +137,7 @@ static Ryconninfo *RyconninfoParse(const char *userdb, char **errmsg) {
 				RyconninfoFree(co);
 				co = NULL;
 				if (errmsg) {
-					*errmsg = turn_strdup(s);
+					*errmsg = strdup(s);
 				}
 				break;
 			}
@@ -150,11 +150,11 @@ static Ryconninfo *RyconninfoParse(const char *userdb, char **errmsg) {
 
 	if(co) {
 		if(!(co->dbname))
-			co->dbname=turn_strdup("0");
+			co->dbname=strdup("0");
 		if(!(co->host))
-			co->host=turn_strdup("127.0.0.1");
+			co->host=strdup("127.0.0.1");
 		if(!(co->password))
-			co->password=turn_strdup("");
+			co->password=strdup("");
 	}
 
 	return co;
@@ -1160,7 +1160,7 @@ static void redis_reread_realms(secrets_list_t * realms_list) {
 							TURN_LOG_FUNC(TURN_LOG_LEVEL_ERROR, "Unexpected type: %d\n", rget->type);
 					} else {
 						get_realm(rget->str);
-						ur_string_map_value_type value = turn_strdup(rget->str);
+						ur_string_map_value_type value = strdup(rget->str);
 						ur_string_map_put(o_to_realm_new, (const ur_string_map_key_type) origin, value);
 					}
 					turnFreeRedisReply(rget);

src/apps/relay/dbdrivers/dbd_sqlite.c

@@ -269,7 +269,7 @@ static int sqlite_get_user_key(u08bits *usname, u08bits *realm, hmackey_t key)
 		if ((rc = sqlite3_prepare(sqliteconnection, statement, -1, &st, 0)) == SQLITE_OK) {
 			int res = sqlite3_step(st);
 			if (res == SQLITE_ROW) {
-				char *kval = turn_strdup((const char*) sqlite3_column_text(st, 0));
+				char *kval = strdup((const char*) sqlite3_column_text(st, 0));
 				size_t sz = get_hmackey_size(SHATYPE_DEFAULT);
 				if (convert_string_key_to_binary(kval, key, sz) < 0) {
 					TURN_LOG_FUNC(TURN_LOG_LEVEL_ERROR, "Wrong key: %s, user %s\n", kval, usname);
@@ -1033,8 +1033,8 @@ static void sqlite_reread_realms(secrets_list_t * realms_list)
 					int res = sqlite3_step(st);
 					if (res == SQLITE_ROW) {
 
-						char* oval = turn_strdup((const char*) sqlite3_column_text(st, 0));
-						char* rval = turn_strdup((const char*) sqlite3_column_text(st, 1));
+						char* oval = strdup((const char*) sqlite3_column_text(st, 0));
+						char* rval = strdup((const char*) sqlite3_column_text(st, 1));
 
 						get_realm(rval);
 						ur_string_map_value_type value = rval;
@@ -1101,7 +1101,7 @@ static void sqlite_reread_realms(secrets_list_t * realms_list)
 					int res = sqlite3_step(st);
 					if (res == SQLITE_ROW) {
 
-						char* rval = turn_strdup((const char*) sqlite3_column_text(st, 0));
+						char* rval = strdup((const char*) sqlite3_column_text(st, 0));
 						const char* oval = (const char*) sqlite3_column_text(st, 1);
 						const char* vval = (const char*) sqlite3_column_text(st, 2);
 

src/apps/relay/mainrelay.c

@@ -1312,7 +1312,7 @@ static void set_option(int c, char *value)
 		if(value) {
 			char *div = strchr(value,'/');
 			if(div) {
-				char *nval=turn_strdup(value);
+				char *nval=strdup(value);
 				div = strchr(nval,'/');
 				div[0]=0;
 				++div;

src/apps/relay/netengine.c

@@ -373,7 +373,7 @@ void add_listener_addr(const char* addr) {
 		++turn_params.listener.addrs_number;
 		++turn_params.listener.services_number;
 		turn_params.listener.addrs = (char**)realloc(turn_params.listener.addrs, sizeof(char*)*turn_params.listener.addrs_number);
-		turn_params.listener.addrs[turn_params.listener.addrs_number-1]=turn_strdup(sbaddr);
+		turn_params.listener.addrs[turn_params.listener.addrs_number-1]=strdup(sbaddr);
 		turn_params.listener.encaddrs = (ioa_addr**)realloc(turn_params.listener.encaddrs, sizeof(ioa_addr*)*turn_params.listener.addrs_number);
 		turn_params.listener.encaddrs[turn_params.listener.addrs_number-1]=(ioa_addr*)malloc(sizeof(ioa_addr));
 		addr_cpy(turn_params.listener.encaddrs[turn_params.listener.addrs_number-1],&baddr);
@@ -400,7 +400,7 @@ int add_relay_addr(const char* addr) {
 
 		++turn_params.relays_number;
 		turn_params.relay_addrs = (char**)realloc(turn_params.relay_addrs, sizeof(char*)*turn_params.relays_number);
-		turn_params.relay_addrs[turn_params.relays_number-1]=turn_strdup(sbaddr);
+		turn_params.relay_addrs[turn_params.relays_number-1]=strdup(sbaddr);
 
 		TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, "Relay address to use: %s\n",sbaddr);
 		return 1;

src/apps/relay/ns_ioalib_engine_impl.c

@@ -562,7 +562,7 @@ ioa_timer_handle set_ioa_timer(ioa_engine_handle e, int secs, int ms, ioa_timer_
 		te->e = e;
 		te->ev = ev;
 		te->cb = cb;
-		te->txt = turn_strdup(txt);
+		te->txt = strdup(txt);
 
 		if(!ms) {
 			tv.tv_usec = 0;

src/apps/relay/turn_admin_server.c

@@ -466,7 +466,7 @@ static int print_session(ur_map_key_type key, ur_map_value_type value, void *arg
 						csarg->users_number * sizeof(size_t));
 				csarg->user_names = (char**)realloc(csarg->user_names,
 						csarg->users_number * sizeof(char*));
-				csarg->user_names[(size_t)value] = turn_strdup((char*)tsi->username);
+				csarg->user_names[(size_t)value] = strdup((char*)tsi->username);
 				csarg->user_counters[(size_t)value] = 0;
 				ur_string_map_put(csarg->users, (ur_string_map_key_type)(char*)tsi->username, value);
 			}

src/apps/relay/userdb.c

@@ -169,7 +169,7 @@ int get_realm_options_by_origin(char *origin, realm_options_t* ro)
 	ur_string_map_value_type value = 0;
 	TURN_MUTEX_LOCK(&o_to_realm_mutex);
 	if (ur_string_map_get(o_to_realm, (ur_string_map_key_type) origin, &value) && value) {
-		char *realm = turn_strdup((char*)value);
+		char *realm = strdup((char*)value);
 		TURN_MUTEX_UNLOCK(&o_to_realm_mutex);
 		realm_params_t rp;
 		get_realm_data(realm, &rp);
@@ -292,7 +292,7 @@ void add_to_secrets_list(secrets_list_t *sl, const char* elem)
 {
 	if(sl && elem) {
 	  sl->secrets = (char**)realloc(sl->secrets,(sizeof(char*)*(sl->sz+1)));
-	  sl->secrets[sl->sz] = turn_strdup(elem);
+	  sl->secrets[sl->sz] = strdup(elem);
 	  sl->sz += 1;
 	}
 }
@@ -384,7 +384,7 @@ static char *get_real_username(char *usname)
 					usname = col+1;
 				} else {
 					*col=0;
-					usname = turn_strdup(usname);
+					usname = strdup(usname);
 					*col=turn_params.rest_api_separator;
 					return usname;
 				}
@@ -392,7 +392,7 @@ static char *get_real_username(char *usname)
 		}
 	}
 
-	return turn_strdup(usname);
+	return strdup(usname);
 }
 
 /*
@@ -660,7 +660,7 @@ int check_new_allocation_quota(u08bits *user, int oauth, u08bits *realm)
 {
 	int ret = 0;
 	if (user || oauth) {
-		u08bits *username = oauth ? (u08bits*)turn_strdup("") : (u08bits*)get_real_username((char*)user);
+		u08bits *username = oauth ? (u08bits*)strdup("") : (u08bits*)get_real_username((char*)user);
 		realm_params_t *rp = get_realm((char*)realm);
 		ur_string_map_lock(rp->status.alloc_counters);
 		if (rp->options.perf_options.total_quota && (rp->status.total_current_allocs >= rp->options.perf_options.total_quota)) {
@@ -692,7 +692,7 @@ int check_new_allocation_quota(u08bits *user, int oauth, u08bits *realm)
 void release_allocation_quota(u08bits *user, int oauth, u08bits *realm)
 {
 	if (user) {
-		u08bits *username = oauth ? (u08bits*)turn_strdup("") : (u08bits*)get_real_username((char*)user);
+		u08bits *username = oauth ? (u08bits*)strdup("") : (u08bits*)get_real_username((char*)user);
 		realm_params_t *rp = get_realm((char*)realm);
 		ur_string_map_lock(rp->status.alloc_counters);
 		if(username[0]) {
@@ -1209,7 +1209,7 @@ void update_white_and_black_lists(void)
 
 int add_ip_list_range(const char * range0, const char * realm, ip_range_list_t * list)
 {
-	char *range = turn_strdup(range0);
+	char *range = strdup(range0);
 
 	char* separator = strchr(range, '-');
 
@@ -1254,7 +1254,7 @@ int add_ip_list_range(const char * range0, const char * realm, ip_range_list_t *
 
 int check_ip_list_range(const char * range0)
 {
-	char *range = turn_strdup(range0);
+	char *range = strdup(range0);
 
 	char* separator = strchr(range, '-');
 

src/client/ns_turn_ioaddr.c

@@ -322,7 +322,7 @@ int make_ioa_addr_from_full_string(const u08bits* saddr, int default_port, ioa_a
 
 	int ret = -1;
 	int port = 0;
-	char* s = turn_strdup((const char*)saddr);
+	char* s = strdup((const char*)saddr);
 	char *sa = get_addr_string_and_port(s,&port);
 	if(sa) {
 		if(port<1)

src/ns_turn_defs.h

@@ -118,14 +118,12 @@ static inline u64bits _ioa_ntoh64(u64bits v)
 #define TURN_LOG_FUNC(level, ...) printf (__VA_ARGS__)
 
   void tm_print_func(void);
-  char *turn_strdup_func(const char* s, const char* function, int line);
   void* debug_ptr_add_func(void *ptr, const char* function, int line);
   void debug_ptr_del_func(void *ptr, const char* function, int line);
 
 #define debug_ptr_add(ptr) debug_ptr_add_func((ptr),__FUNCTION__,__LINE__)
 #define debug_ptr_del(ptr) debug_ptr_del_func((ptr),__FUNCTION__,__LINE__)
 #define tm_print() tm_print_func()
-#define turn_strdup(s) turn_strdup_func((s),__FUNCTION__,__LINE__)
 
 #define SSL_NEW(ctx) ((SSL*)debug_ptr_add(SSL_new(ctx)))
 
@@ -134,7 +132,6 @@ static inline u64bits _ioa_ntoh64(u64bits v)
 #define debug_ptr_add(ptr)
 #define debug_ptr_del(ptr)
 #define tm_print() 
-#define turn_strdup(s) strdup((s))
 
 #define SSL_NEW(ctx) SSL_new(ctx)