From a6e5bae3ef9fe498927e0b5f9318a64c9ff101a9 Mon Sep 17 00:00:00 2001 From: Corey Farrell Date: Wed, 26 Oct 2016 22:40:49 -0400 Subject: Remove ASTERISK_REGISTER_FILE. ASTERISK_REGISTER_FILE no longer has any purpose so this commit removes all traces of it. Previously exported symbols removed: * __ast_register_file * __ast_unregister_file * ast_complete_source_filename This also removes the mtx_prof static variable that was declared when MTX_PROFILE was enabled. This variable was only used in lock.c so it is now initialized in that file only. ASTERISK-26480 #close Change-Id: I1074af07d71f9e159c48ef36631aa432c86f9966 --- utils/ael_main.c | 4 ---- utils/astman.c | 11 ----------- utils/check_expr.c | 8 -------- utils/conf2ael.c | 10 ---------- 4 files changed, 33 deletions(-) (limited to 'utils') diff --git a/utils/ael_main.c b/utils/ael_main.c index 1801b12b8..f22e9a05b 100644 --- a/utils/ael_main.c +++ b/utils/ael_main.c @@ -18,8 +18,6 @@ #include #include -ASTERISK_REGISTER_FILE() - #include "asterisk/backtrace.h" #include "asterisk/channel.h" #include "asterisk/ast_expr.h" @@ -32,8 +30,6 @@ ASTERISK_REGISTER_FILE() int option_debug = 0; int option_verbose = 0; -void __ast_register_file(const char *file) { } -void __ast_unregister_file(const char *file) { } /*** MODULEINFO res_ael_share diff --git a/utils/astman.c b/utils/astman.c index a6803c8a5..63d7f5ada 100644 --- a/utils/astman.c +++ b/utils/astman.c @@ -27,7 +27,6 @@ ***/ #include "asterisk.h" -ASTERISK_REGISTER_FILE() #include #include @@ -88,16 +87,6 @@ struct ast_chan { static AST_LIST_HEAD_NOLOCK_STATIC(chans, ast_chan); /* dummy functions to be compatible with the Asterisk core for md5.c */ -void __ast_register_file(const char *file); -void __ast_register_file(const char *file) -{ -} - -void __ast_unregister_file(const char *file); -void __ast_unregister_file(const char *file) -{ -} - int ast_add_profile(const char *, uint64_t scale); int ast_add_profile(const char *s, uint64_t scale) { diff --git a/utils/check_expr.c b/utils/check_expr.c index abfb91dcf..201fa04d2 100644 --- a/utils/check_expr.c +++ b/utils/check_expr.c @@ -21,7 +21,6 @@ ***/ #include "asterisk.h" -ASTERISK_REGISTER_FILE() #include "asterisk/ast_expr.h" @@ -157,8 +156,6 @@ unsigned int check_expr(char* buffer, char* error_report); int check_eval(char *buffer, char *error_report); void parse_file(const char *fname); -void __ast_register_file(const char *file); -void __ast_register_file(const char *file) { } int ast_add_profile(const char *x, uint64_t scale) { return 0;} int ast_atomic_fetchadd_int_slow(volatile int *p, int v) { @@ -168,11 +165,6 @@ int ast_atomic_fetchadd_int_slow(volatile int *p, int v) return ret; } -void __ast_unregister_file(const char *file); -void __ast_unregister_file(const char *file) -{ -} - char *find_var(const char *varname) /* the list should be pretty short, if there's any list at all */ { struct varz *t; diff --git a/utils/conf2ael.c b/utils/conf2ael.c index 3ebc56e4a..1767d9833 100644 --- a/utils/conf2ael.c +++ b/utils/conf2ael.c @@ -28,7 +28,6 @@ ***/ #include "asterisk.h" -ASTERISK_REGISTER_FILE() #include "asterisk/paths.h" /* CONFIG_DIR */ #include @@ -79,15 +78,6 @@ char ast_config_AST_SYSTEM_NAME[20] = ""; */ int option_debug = 0; int option_verbose = 0; -void __ast_register_file(const char *file); -void __ast_register_file(const char *file) -{ -} - -void __ast_unregister_file(const char *file); -void __ast_unregister_file(const char *file) -{ -} int ast_add_profile(const char *x, uint64_t scale) { return 0;} /* Our own version of ast_log, since the expr parser uses it. -- stolen from utils/check_expr.c */ void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...) __attribute__((format(printf,5,6))); -- cgit v1.2.3