From e4a483d71ecbb1c7f02c29e0f469757034989e63 Mon Sep 17 00:00:00 2001 From: Philipp Schafft Date: Fri, 12 Oct 2018 10:12:56 +0000 Subject: [PATCH] Cleanup: Removed _mangle() --- avl/avl.h | 28 ---------------------------- httpp/httpp.h | 19 ------------------- net/resolver.h | 7 ------- net/sock.h | 31 ------------------------------- thread/thread.h | 29 ----------------------------- timing/timing.c | 2 -- timing/timing.h | 6 ------ 7 files changed, 122 deletions(-) diff --git a/avl/avl.h b/avl/avl.h index 3e02ce4..6a61413 100644 --- a/avl/avl.h +++ b/avl/avl.h @@ -64,34 +64,6 @@ typedef int (*avl_key_printer_fun_type) (char *, void *); * function with each tree, separately. */ -#ifdef _mangle -# define avl_tree_new _mangle(avl_tree_new) -# define avl_node_new _mangle(avl_node_new) -# define avl_tree_free _mangle(avl_tree_free) -# define avl_insert _mangle(avl_insert) -# define avl_delete _mangle(avl_delete) -# define avl_get_by_index _mangle(avl_get_by_index) -# define avl_get_by_key _mangle(avl_get_by_key) -# define avl_iterate_inorder _mangle(avl_iterate_inorder) -# define avl_iterate_index_range _mangle(avl_iterate_index_range) -# define avl_tree_rlock _mangle(avl_tree_rlock) -# define avl_tree_wlock _mangle(avl_tree_wlock) -# define avl_tree_wlock _mangle(avl_tree_wlock) -# define avl_tree_unlock _mangle(avl_tree_unlock) -# define avl_node_rlock _mangle(avl_node_rlock) -# define avl_node_wlock _mangle(avl_node_wlock) -# define avl_node_unlock _mangle(avl_node_unlock) -# define avl_get_span_by_key _mangle(avl_get_span_by_key) -# define avl_get_span_by_two_keys _mangle(avl_get_span_by_two_keys) -# define avl_verify _mangle(avl_verify) -# define avl_print_tree _mangle(avl_print_tree) -# define avl_get_first _mangle(avl_get_first) -# define avl_get_prev _mangle(avl_get_prev) -# define avl_get_next _mangle(avl_get_next) -# define avl_get_item_by_key_most _mangle(avl_get_item_by_key_most) -# define avl_get_item_by_key_least _mangle(avl_get_item_by_key_least) -#endif - typedef struct _avl_tree { avl_node * root; unsigned int height; diff --git a/httpp/httpp.h b/httpp/httpp.h index 824d296..25c091a 100644 --- a/httpp/httpp.h +++ b/httpp/httpp.h @@ -97,25 +97,6 @@ typedef struct http_parser_tag { avl_tree *postvars; } http_parser_t; -#ifdef _mangle -# define httpp_request_info _mangle(httpp_request_info) -# define httpp_create_parser _mangle(httpp_create_parser) -# define httpp_initialize _mangle(httpp_initialize) -# define httpp_parse _mangle(httpp_parse) -# define httpp_parse_icy _mangle(httpp_parse_icy) -# define httpp_parse_response _mangle(httpp_parse_response) -# define httpp_parse_postdata _mangle(httpp_parse_postdata) -# define httpp_setvar _mangle(httpp_setvar) -# define httpp_getvar _mangle(httpp_getvar) -# define httpp_set_query_param _mangle(httpp_set_query_param) -# define httpp_get_query_param _mangle(httpp_get_query_param) -# define httpp_set_post_param _mangle(httpp_set_post_param) -# define httpp_get_post_param _mangle(httpp_get_post_param) -# define httpp_get_param _mangle(httpp_get_param) -# define httpp_destroy _mangle(httpp_destroy) -# define httpp_clear _mangle(httpp_clear) -#endif - httpp_request_info_t httpp_request_info(httpp_request_type_e req); http_parser_t *httpp_create_parser(void); diff --git a/net/resolver.h b/net/resolver.h index d4529ce..23010e1 100644 --- a/net/resolver.h +++ b/net/resolver.h @@ -38,13 +38,6 @@ ** */ -#ifdef _mangle -# define resolver_initialize _mangle(resolver_initialize) -# define resolver_shutdown _mangle(resolver_shutdown) -# define resolver_getname _mangle(resolver_getname) -# define resolver_getip _mangle(resolver_getip) -#endif - void resolver_initialize(void); void resolver_shutdown(void); diff --git a/net/sock.h b/net/sock.h index e0e3d4f..212f86b 100644 --- a/net/sock.h +++ b/net/sock.h @@ -73,37 +73,6 @@ struct iovec /* sock connect macro */ #define sock_connect(h, p) sock_connect_wto(h, p, 0) -#ifdef _mangle -# define sock_initialize _mangle(sock_initialize) -# define sock_shutdown _mangle(sock_shutdown) -# define sock_get_localip _mangle(sock_get_localip) -# define sock_error _mangle(sock_error) -# define sock_set_error _mangle(sock_set_error) -# define sock_recoverable _mangle(sock_recoverable) -# define sock_stalled _mangle(sock_stalled) -# define sock_valid_socket _mangle(sock_valid_socket) -# define sock_set_blocking _mangle(sock_set_blocking) -# define sock_set_nolinger _mangle(sock_set_nolinger) -# define sock_set_nodelay _mangle(sock_set_nodelay) -# define sock_set_keepalive _mangle(sock_set_keepalive) -# define sock_close _mangle(sock_close) -# define sock_connect_wto _mangle(sock_connect_wto) -# define sock_connect_wto_bind _mangle(sock_connect_wto_bind) -# define sock_connect_non_blocking _mangle(sock_connect_non_blocking) -# define sock_connected _mangle(sock_connected) -# define sock_write_bytes _mangle(sock_write_bytes) -# define sock_write _mangle(sock_write) -# define sock_write_fmt _mangle(sock_write_fmt) -# define sock_write_string _mangle(sock_write_string) -# define sock_writev _mangle(sock_writev) -# define sock_read_bytes _mangle(sock_read_bytes) -# define sock_read_line _mangle(sock_read_line) -# define sock_get_server_socket _mangle(sock_get_server_socket) -# define sock_listen _mangle(sock_listen) -# define sock_set_send_buffer _mangle(sock_set_send_buffer) -# define sock_accept _mangle(sock_accept) -#endif - /* Misc socket functions */ void sock_initialize(void); void sock_shutdown(void); diff --git a/thread/thread.h b/thread/thread.h index d2c3be3..9dfd222 100644 --- a/thread/thread.h +++ b/thread/thread.h @@ -133,35 +133,6 @@ typedef mutex_t spin_t; #define THREAD_DETACHED 1 #define THREAD_ATTACHED 0 -#ifdef _mangle -# define thread_initialize _mangle(thread_initialize) -# define thread_initialize_with_log_id _mangle(thread_initialize_with_log_id) -# define thread_shutdown _mangle(thread_shutdown) -# define thread_create_c _mangle(thread_create_c) -# define thread_mutex_create_c _mangle(thread_mutex_create) -# define thread_mutex_lock_c _mangle(thread_mutex_lock_c) -# define thread_mutex_unlock_c _mangle(thread_mutex_unlock_c) -# define thread_mutex_destroy _mangle(thread_mutex_destroy) -# define thread_cond_create_c _mangle(thread_cond_create_c) -# define thread_cond_signal_c _mangle(thread_cond_signal_c) -# define thread_cond_broadcast_c _mangle(thread_cond_broadcast_c) -# define thread_cond_wait_c _mangle(thread_cond_wait_c) -# define thread_cond_timedwait_c _mangle(thread_cond_timedwait_c) -# define thread_cond_destroy _mangle(thread_cond_destroy) -# define thread_rwlock_create_c _mangle(thread_rwlock_create_c) -# define thread_rwlock_rlock_c _mangle(thread_rwlock_rlock_c) -# define thread_rwlock_wlock_c _mangle(thread_rwlock_wlock_c) -# define thread_rwlock_unlock_c _mangle(thread_rwlock_unlock_c) -# define thread_rwlock_destroy _mangle(thread_rwlock_destroy) -# define thread_exit_c _mangle(thread_exit_c) -# define thread_sleep _mangle(thread_sleep) -# define thread_library_lock _mangle(thread_library_lock) -# define thread_library_unlock _mangle(thread_library_unlock) -# define thread_self _mangle(thread_self) -# define thread_rename _mangle(thread_rename) -# define thread_join _mangle(thread_join) -#endif - /* init/shutdown of the library */ void thread_initialize(void); void thread_initialize_with_log_id(int log_id); diff --git a/timing/timing.c b/timing/timing.c index 9be67d5..7273918 100644 --- a/timing/timing.c +++ b/timing/timing.c @@ -60,8 +60,6 @@ #include "timing.h" -/* see timing.h for an explanation of _mangle() */ - /* * Returns milliseconds no matter what. */ diff --git a/timing/timing.h b/timing/timing.h index 4ef88a0..55868fd 100644 --- a/timing/timing.h +++ b/timing/timing.h @@ -39,12 +39,6 @@ typedef __int64 int64_t; typedef unsigned __int64 uint64_t; #endif -/* config.h should be included before we are to define _mangle */ -#ifdef _mangle -# define timing_get_time _mangle(timing_get_time) -# define timing_sleep _mangle(timing_sleep) -#endif - uint64_t timing_get_time(void); void timing_sleep(uint64_t sleeptime);