diff options
| author | Matt Jordan <mjordan@digium.com> | 2015-04-11 21:38:22 -0500 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2015-04-13 03:48:57 -0400 |
| commit | 4a58261694f1538a419dd869f87ea4590171a9f2 (patch) | |
| tree | a8d3196d5b69f233f814ef3fa7a543c2ce50bd24 /main | |
| parent | 1174ef588dafe864fe3f2c1f8297690def8f85d1 (diff) | |
git migration: Refactor the ASTERISK_FILE_VERSION macro
Git does not support the ability to replace a token with a version
string during check-in. While it does have support for replacing a
token on clone, this is somewhat sub-optimal: the token is replaced
with the object hash, which is not particularly easy for human
consumption. What's more, in practice, the source file version was often
not terribly useful. Generally, when triaging bugs, the overall version
of Asterisk is far more useful than an individual SVN version of a file. As a
result, this patch removes Asterisk's support for showing source file
versions.
Specifically, it does the following:
* Rename ASTERISK_FILE_VERSION macro to ASTERISK_REGISTER_FILE, and
remove passing the version in with the macro. Other facilities
than 'core show file version' make use of the file names, such as
setting a debug level only on a specific file. As such, the act of
registering source files with the Asterisk core still has use. The
macro rename now reflects the new macro purpose.
* main/asterisk:
- Refactor the file_version structure to reflect that it no longer
tracks a version field.
- Remove the "core show file version" CLI command. Without the file
version, it is no longer useful.
- Remove the ast_file_version_find function. The file version is no
longer tracked.
- Rename ast_register_file_version/ast_unregister_file_version to
ast_register_file/ast_unregister_file, respectively.
* main/manager: Remove value from the Version key of the ModuleCheck
Action. The actual key itself has not been removed, as doing so would
absolutely constitute a backwards incompatible change. However, since
the file version is no longer tracked, there is no need to attempt to
include it in the Version key.
* UPGRADE: Add notes for:
- Modification to the ModuleCheck AMI Action
- Removal of the "core show file version" CLI command
Change-Id: I6cf0ff280e1668bf4957dc21f32a5ff43444a40e
Diffstat (limited to 'main')
135 files changed, 160 insertions, 273 deletions
diff --git a/main/abstract_jb.c b/main/abstract_jb.c index b629fe826..c703c6872 100644 --- a/main/abstract_jb.c +++ b/main/abstract_jb.c @@ -35,7 +35,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/frame.h" #include "asterisk/channel.h" diff --git a/main/acl.c b/main/acl.c index fa1e35c74..92b675443 100644 --- a/main/acl.c +++ b/main/acl.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/network.h" diff --git a/main/alaw.c b/main/alaw.c index c5069f358..3b9bfd6b9 100644 --- a/main/alaw.c +++ b/main/alaw.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/alaw.h" #include "asterisk/logger.h" diff --git a/main/aoc.c b/main/aoc.c index 5bce06651..ba44fbfb9 100644 --- a/main/aoc.c +++ b/main/aoc.c @@ -28,7 +28,7 @@ ***/ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$"); +ASTERISK_REGISTER_FILE(); #include "asterisk/aoc.h" #include "asterisk/utils.h" diff --git a/main/app.c b/main/app.c index 37afe4297..2046ac8a0 100644 --- a/main/app.c +++ b/main/app.c @@ -35,7 +35,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> diff --git a/main/ast_expr2.c b/main/ast_expr2.c index f42604ee6..84a3d7b97 100644 --- a/main/ast_expr2.c +++ b/main/ast_expr2.c @@ -99,7 +99,7 @@ #if !defined(STANDALONE) && !defined(STANDALONE2) \ -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #else #ifndef __USE_ISOC99 #define __USE_ISOC99 1 diff --git a/main/ast_expr2f.c b/main/ast_expr2f.c index 51af56b40..c2d4e00a4 100644 --- a/main/ast_expr2f.c +++ b/main/ast_expr2f.c @@ -521,7 +521,7 @@ static yyconst flex_int16_t yy_chk[159] = #include <stdio.h> #if !defined(STANDALONE) -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #else #ifndef __USE_ISOC99 #define __USE_ISOC99 1 diff --git a/main/asterisk.c b/main/asterisk.c index baf5ded4f..574451c65 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -149,7 +149,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" @@ -475,87 +475,65 @@ static struct { } sig_flags; #if !defined(LOW_MEMORY) -struct file_version { - AST_RWLIST_ENTRY(file_version) list; +struct registered_file { + AST_RWLIST_ENTRY(registered_file) list; const char *file; - char *version; }; -static AST_RWLIST_HEAD_STATIC(file_versions, file_version); +static AST_RWLIST_HEAD_STATIC(registered_files, registered_file); -void ast_register_file_version(const char *file, const char *version) +void __ast_register_file(const char *file) { - struct file_version *new; - char *work; - size_t version_length; - - work = ast_strdupa(version); - work = ast_strip(ast_strip_quoted(work, "$", "$")); - version_length = strlen(work) + 1; + struct registered_file *reg; - if (!(new = ast_calloc(1, sizeof(*new) + version_length))) + reg = ast_calloc(1, sizeof(*reg)); + if (!reg) { return; + } - new->file = file; - new->version = (char *) new + sizeof(*new); - memcpy(new->version, work, version_length); - AST_RWLIST_WRLOCK(&file_versions); - AST_RWLIST_INSERT_HEAD(&file_versions, new, list); - AST_RWLIST_UNLOCK(&file_versions); + reg->file = file; + AST_RWLIST_WRLOCK(®istered_files); + AST_RWLIST_INSERT_HEAD(®istered_files, reg, list); + AST_RWLIST_UNLOCK(®istered_files); } -void ast_unregister_file_version(const char *file) +void __ast_unregister_file(const char *file) { - struct file_version *find; + struct registered_file *find; - AST_RWLIST_WRLOCK(&file_versions); - AST_RWLIST_TRAVERSE_SAFE_BEGIN(&file_versions, find, list) { + AST_RWLIST_WRLOCK(®istered_files); + AST_RWLIST_TRAVERSE_SAFE_BEGIN(®istered_files, find, list) { if (!strcasecmp(find->file, file)) { AST_RWLIST_REMOVE_CURRENT(list); break; } } AST_RWLIST_TRAVERSE_SAFE_END; - AST_RWLIST_UNLOCK(&file_versions); + AST_RWLIST_UNLOCK(®istered_files); - if (find) + if (find) { ast_free(find); + } } char *ast_complete_source_filename(const char *partial, int n) { - struct file_version *find; + struct registered_file *find; size_t len = strlen(partial); int count = 0; char *res = NULL; - AST_RWLIST_RDLOCK(&file_versions); - AST_RWLIST_TRAVERSE(&file_versions, find, list) { + AST_RWLIST_RDLOCK(®istered_files); + AST_RWLIST_TRAVERSE(®istered_files, find, list) { if (!strncasecmp(find->file, partial, len) && ++count > n) { res = ast_strdup(find->file); break; } } - AST_RWLIST_UNLOCK(&file_versions); + AST_RWLIST_UNLOCK(®istered_files); return res; } -/*! \brief Find version for given module name */ -const char *ast_file_version_find(const char *file) -{ - struct file_version *iterator; - - AST_RWLIST_WRLOCK(&file_versions); - AST_RWLIST_TRAVERSE(&file_versions, iterator, list) { - if (!strcasecmp(iterator->file, file)) - break; - } - AST_RWLIST_UNLOCK(&file_versions); - if (iterator) - return iterator->version; - return NULL; -} - struct thread_list_t { AST_RWLIST_ENTRY(thread_list_t) list; char *name; @@ -1031,88 +1009,6 @@ static char *handle_clear_profile(struct ast_cli_entry *e, int cmd, struct ast_c } #undef DEFINE_PROFILE_MIN_MAX_VALUES -/*! \brief CLI command to list module versions */ -static char *handle_show_version_files(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) -{ -#define FORMAT "%-25.25s %-40.40s\n" - struct file_version *iterator; - regex_t regexbuf; - int havepattern = 0; - int havename = 0; - int count_files = 0; - char *ret = NULL; - int matchlen, which = 0; - struct file_version *find; - - switch (cmd) { - case CLI_INIT: - e->command = "core show file version [like]"; - e->usage = - "Usage: core show file version [like <pattern>]\n" - " Lists the revision numbers of the files used to build this copy of Asterisk.\n" - " Optional regular expression pattern is used to filter the file list.\n"; - return NULL; - case CLI_GENERATE: - matchlen = strlen(a->word); - if (a->pos != 3) - return NULL; - AST_RWLIST_RDLOCK(&file_versions); - AST_RWLIST_TRAVERSE(&file_versions, find, list) { - if (!strncasecmp(a->word, find->file, matchlen) && ++which > a->n) { - ret = ast_strdup(find->file); - break; - } - } - AST_RWLIST_UNLOCK(&file_versions); - return ret; - } - - - switch (a->argc) { - case 6: - if (!strcasecmp(a->argv[4], "like")) { - if (regcomp(®exbuf, a->argv[5], REG_EXTENDED | REG_NOSUB)) - return CLI_SHOWUSAGE; - havepattern = 1; - } else - return CLI_SHOWUSAGE; - break; - case 5: - havename = 1; - break; - case 4: - break; - default: - return CLI_SHOWUSAGE; - } - - ast_cli(a->fd, FORMAT, "File", "Revision"); - ast_cli(a->fd, FORMAT, "----", "--------"); - AST_RWLIST_RDLOCK(&file_versions); - AST_RWLIST_TRAVERSE(&file_versions, iterator, list) { - if (havename && strcasecmp(iterator->file, a->argv[4])) - continue; - - if (havepattern && regexec(®exbuf, iterator->file, 0, NULL, 0)) - continue; - - ast_cli(a->fd, FORMAT, iterator->file, iterator->version); - count_files++; - if (havename) - break; - } - AST_RWLIST_UNLOCK(&file_versions); - if (!havename) { - ast_cli(a->fd, "%d files listed.\n", count_files); - } - - if (havepattern) - regfree(®exbuf); - - return CLI_SUCCESS; -#undef FORMAT -} - #endif /* ! LOW_MEMORY */ static void publish_fully_booted(void) @@ -2701,7 +2597,6 @@ static struct ast_cli_entry cli_asterisk[] = { AST_CLI_DEFINE(handle_version, "Display version info"), AST_CLI_DEFINE(handle_bang, "Execute a shell command"), #if !defined(LOW_MEMORY) - AST_CLI_DEFINE(handle_show_version_files, "List versions of files used to build Asterisk"), AST_CLI_DEFINE(handle_show_threads, "Show running threads"), #if defined(HAVE_SYSINFO) || defined(HAVE_SYSCTL) AST_CLI_DEFINE(handle_show_sysinfo, "Show System Information"), diff --git a/main/astfd.c b/main/astfd.c index d9119c968..72c5761d7 100644 --- a/main/astfd.c +++ b/main/astfd.c @@ -31,7 +31,7 @@ #ifdef DEBUG_FD_LEAKS -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <stdio.h> #include <string.h> diff --git a/main/astmm.c b/main/astmm.c index 5812174d5..a4d5602ce 100644 --- a/main/astmm.c +++ b/main/astmm.c @@ -32,7 +32,7 @@ #if defined(__AST_DEBUG_MALLOC) -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/paths.h" /* use ast_config_AST_LOG_DIR */ #include <stddef.h> diff --git a/main/astobj2.c b/main/astobj2.c index f1d500174..0f6ed739b 100644 --- a/main/astobj2.c +++ b/main/astobj2.c @@ -27,7 +27,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" #include "asterisk/astobj2.h" diff --git a/main/astobj2_container.c b/main/astobj2_container.c index dc6f5e5c5..d0abc7985 100644 --- a/main/astobj2_container.c +++ b/main/astobj2_container.c @@ -22,7 +22,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" #include "asterisk/astobj2.h" diff --git a/main/astobj2_hash.c b/main/astobj2_hash.c index 37d4b6017..76259dc7f 100644 --- a/main/astobj2_hash.c +++ b/main/astobj2_hash.c @@ -23,7 +23,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" #include "asterisk/astobj2.h" diff --git a/main/astobj2_rbtree.c b/main/astobj2_rbtree.c index 2e3a73eaa..a069c408e 100644 --- a/main/astobj2_rbtree.c +++ b/main/astobj2_rbtree.c @@ -23,7 +23,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" #include "asterisk/astobj2.h" diff --git a/main/audiohook.c b/main/audiohook.c index 1883c0091..b754f2329 100644 --- a/main/audiohook.c +++ b/main/audiohook.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <signal.h> diff --git a/main/autochan.c b/main/autochan.c index 7da249a13..d41a8d821 100644 --- a/main/autochan.c +++ b/main/autochan.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/autochan.h" #include "asterisk/utils.h" diff --git a/main/autoservice.c b/main/autoservice.c index 9630990d1..1af052d08 100644 --- a/main/autoservice.c +++ b/main/autoservice.c @@ -31,7 +31,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <sys/time.h> #include <signal.h> diff --git a/main/backtrace.c b/main/backtrace.c index a1156467f..3b490e8c3 100644 --- a/main/backtrace.c +++ b/main/backtrace.c @@ -27,7 +27,7 @@ ***/ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$"); +ASTERISK_REGISTER_FILE(); #include "asterisk/backtrace.h" #include "asterisk/utils.h" diff --git a/main/bridge.c b/main/bridge.c index 7b69b6fb3..b1c42ff58 100644 --- a/main/bridge.c +++ b/main/bridge.c @@ -71,7 +71,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/logger.h" #include "asterisk/channel.h" diff --git a/main/bridge_after.c b/main/bridge_after.c index a41f8a548..e2f14ab61 100644 --- a/main/bridge_after.c +++ b/main/bridge_after.c @@ -32,7 +32,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/logger.h" #include "asterisk/channel.h" diff --git a/main/bridge_basic.c b/main/bridge_basic.c index 522a7d40c..c48db5c00 100644 --- a/main/bridge_basic.c +++ b/main/bridge_basic.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/channel.h" #include "asterisk/utils.h" diff --git a/main/bridge_channel.c b/main/bridge_channel.c index c25d827cb..9e300684d 100644 --- a/main/bridge_channel.c +++ b/main/bridge_channel.c @@ -32,7 +32,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <signal.h> diff --git a/main/bridge_roles.c b/main/bridge_roles.c index 1d781ca93..030523735 100644 --- a/main/bridge_roles.c +++ b/main/bridge_roles.c @@ -31,7 +31,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <signal.h> diff --git a/main/bucket.c b/main/bucket.c index 7618761b9..e93c66b19 100644 --- a/main/bucket.c +++ b/main/bucket.c @@ -60,7 +60,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #ifdef HAVE_URIPARSER #include <uriparser/Uri.h> diff --git a/main/callerid.c b/main/callerid.c index a99dafc44..69fe6ff70 100644 --- a/main/callerid.c +++ b/main/callerid.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <time.h> #include <math.h> diff --git a/main/ccss.c b/main/ccss.c index ff5739ab0..c1b3372dc 100644 --- a/main/ccss.c +++ b/main/ccss.c @@ -36,7 +36,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/astobj2.h" #include "asterisk/strings.h" diff --git a/main/cdr.c b/main/cdr.c index 5e24dae1b..9b32f9d9f 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -45,7 +45,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <signal.h> #include <inttypes.h> diff --git a/main/cel.c b/main/cel.c index 0c1e37b68..f2d516883 100644 --- a/main/cel.c +++ b/main/cel.c @@ -38,7 +38,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" diff --git a/main/channel.c b/main/channel.c index af9395616..4e418b6ea 100644 --- a/main/channel.c +++ b/main/channel.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" diff --git a/main/channel_internal_api.c b/main/channel_internal_api.c index 0ff844440..a2fafbf33 100644 --- a/main/channel_internal_api.c +++ b/main/channel_internal_api.c @@ -33,7 +33,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <unistd.h> #include <fcntl.h> diff --git a/main/chanvars.c b/main/chanvars.c index 37714e9a2..dc97df773 100644 --- a/main/chanvars.c +++ b/main/chanvars.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/chanvars.h" #include "asterisk/strings.h" diff --git a/main/cli.c b/main/cli.c index 42f56fcfd..9d3cdf3f4 100644 --- a/main/cli.c +++ b/main/cli.c @@ -38,7 +38,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" #include "asterisk/paths.h" /* use ast_config_AST_MODULE_DIR */ diff --git a/main/codec.c b/main/codec.c index 543d4d0bd..9c4169a1c 100644 --- a/main/codec.c +++ b/main/codec.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/logger.h" #include "asterisk/codec.h" diff --git a/main/codec_builtin.c b/main/codec_builtin.c index 2e89e9a7d..4be635e1b 100644 --- a/main/codec_builtin.c +++ b/main/codec_builtin.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/logger.h" #include "asterisk/astobj2.h" diff --git a/main/config.c b/main/config.c index daccae535..bc622ccab 100644 --- a/main/config.c +++ b/main/config.c @@ -32,7 +32,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/paths.h" /* use ast_config_AST_CONFIG_DIR */ #include "asterisk/network.h" /* we do some sockaddr manipulation here */ diff --git a/main/config_options.c b/main/config_options.c index 0cc2dda3e..a1ba5d2e5 100644 --- a/main/config_options.c +++ b/main/config_options.c @@ -27,7 +27,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <regex.h> diff --git a/main/core_local.c b/main/core_local.c index 1bcd91db2..f81c71cd6 100644 --- a/main/core_local.c +++ b/main/core_local.c @@ -33,7 +33,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() /* ------------------------------------------------------------------- */ diff --git a/main/core_unreal.c b/main/core_unreal.c index f26642429..55b4ea368 100644 --- a/main/core_unreal.c +++ b/main/core_unreal.c @@ -32,7 +32,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/causes.h" #include "asterisk/channel.h" diff --git a/main/crypt.c b/main/crypt.c index 5e5df02cd..a4cf664b1 100644 --- a/main/crypt.c +++ b/main/crypt.c @@ -28,7 +28,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <unistd.h> #if defined(HAVE_CRYPT_R) diff --git a/main/data.c b/main/data.c index 33a7c040f..1aaae18f1 100644 --- a/main/data.c +++ b/main/data.c @@ -28,7 +28,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" diff --git a/main/datastore.c b/main/datastore.c index ed9b3210e..a9079e837 100644 --- a/main/datastore.c +++ b/main/datastore.c @@ -25,7 +25,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" @@ -33,7 +33,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" #include "asterisk/paths.h" /* use ast_config_AST_DB */ diff --git a/main/devicestate.c b/main/devicestate.c index 7eb9e3057..e2cc2f2f3 100644 --- a/main/devicestate.c +++ b/main/devicestate.c @@ -143,7 +143,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" #include "asterisk/channel.h" diff --git a/main/dial.c b/main/dial.c index 210715556..f0cf12737 100644 --- a/main/dial.c +++ b/main/dial.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <sys/time.h> #include <signal.h> diff --git a/main/dns.c b/main/dns.c index 320d91768..fd8742026 100644 --- a/main/dns.c +++ b/main/dns.c @@ -35,7 +35,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/network.h" #include <arpa/nameser.h> /* res_* functions */ diff --git a/main/dns_core.c b/main/dns_core.c index 53ea1d09e..e66c71d62 100644 --- a/main/dns_core.c +++ b/main/dns_core.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/linkedlists.h" #include "asterisk/vector.h" diff --git a/main/dns_naptr.c b/main/dns_naptr.c index 72f28dc81..4d5a5f99a 100644 --- a/main/dns_naptr.c +++ b/main/dns_naptr.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <arpa/nameser.h> #include <resolv.h> diff --git a/main/dns_query_set.c b/main/dns_query_set.c index 45626d1b9..852fa3e53 100644 --- a/main/dns_query_set.c +++ b/main/dns_query_set.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/vector.h" #include "asterisk/astobj2.h" diff --git a/main/dns_recurring.c b/main/dns_recurring.c index 3ebbab070..855273f10 100644 --- a/main/dns_recurring.c +++ b/main/dns_recurring.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/astobj2.h" #include "asterisk/linkedlists.h" diff --git a/main/dns_srv.c b/main/dns_srv.c index a617ede4d..f5d038ae7 100644 --- a/main/dns_srv.c +++ b/main/dns_srv.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <netinet/in.h> #include <arpa/nameser.h> diff --git a/main/dns_tlsa.c b/main/dns_tlsa.c index aa6f5308f..85db40b74 100644 --- a/main/dns_tlsa.c +++ b/main/dns_tlsa.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/dns_core.h" #include "asterisk/dns_tlsa.h" @@ -52,4 +52,4 @@ unsigned int ast_dns_tlsa_get_matching_type(const struct ast_dns_record *record) const char *ast_dns_tlsa_get_association_data(const struct ast_dns_record *record) { return NULL; -}
\ No newline at end of file +} diff --git a/main/dnsmgr.c b/main/dnsmgr.c index b5bfd17be..b976c68c5 100644 --- a/main/dnsmgr.c +++ b/main/dnsmgr.c @@ -45,7 +45,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" #include <regex.h> diff --git a/main/dsp.c b/main/dsp.c index 087416358..193bf9fd5 100644 --- a/main/dsp.c +++ b/main/dsp.c @@ -55,7 +55,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <math.h> diff --git a/main/endpoints.c b/main/endpoints.c index 66ad4618e..c70170b41 100644 --- a/main/endpoints.c +++ b/main/endpoints.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/astobj2.h" #include "asterisk/endpoints.h" diff --git a/main/enum.c b/main/enum.c index bae129965..865fa3a07 100644 --- a/main/enum.c +++ b/main/enum.c @@ -60,7 +60,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <sys/socket.h> #include <netinet/in.h> diff --git a/main/event.c b/main/event.c index 8880b9699..228807dd8 100644 --- a/main/event.c +++ b/main/event.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" diff --git a/main/features.c b/main/features.c index df464d566..971fb4a02 100644 --- a/main/features.c +++ b/main/features.c @@ -39,7 +39,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" diff --git a/main/file.c b/main/file.c index c32de2811..acd2cc6bc 100644 --- a/main/file.c +++ b/main/file.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <dirent.h> #include <sys/stat.h> diff --git a/main/fixedjitterbuf.c b/main/fixedjitterbuf.c index 17cad494a..db7c157c3 100644 --- a/main/fixedjitterbuf.c +++ b/main/fixedjitterbuf.c @@ -31,7 +31,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <assert.h> diff --git a/main/format.c b/main/format.c index 3e1ee866e..8fed71f73 100644 --- a/main/format.c +++ b/main/format.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/logger.h" #include "asterisk/codec.h" diff --git a/main/format_cache.c b/main/format_cache.c index 6638a78c0..3e729769c 100644 --- a/main/format_cache.c +++ b/main/format_cache.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/logger.h" #include "asterisk/format.h" diff --git a/main/format_cap.c b/main/format_cap.c index 177652efb..c9c6c3b30 100644 --- a/main/format_cap.c +++ b/main/format_cap.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/logger.h" #include "asterisk/format.h" diff --git a/main/format_compatibility.c b/main/format_compatibility.c index cf66af282..9bf263b5b 100644 --- a/main/format_compatibility.c +++ b/main/format_compatibility.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/logger.h" #include "asterisk/astobj2.h" diff --git a/main/frame.c b/main/frame.c index 64af88237..ae2120a5a 100644 --- a/main/frame.c +++ b/main/frame.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" #include "asterisk/lock.h" diff --git a/main/framehook.c b/main/framehook.c index e42a232c0..e12b45931 100644 --- a/main/framehook.c +++ b/main/framehook.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/channel.h" #include "asterisk/linkedlists.h" diff --git a/main/fskmodem_float.c b/main/fskmodem_float.c index 7bddee7f5..98f0c173b 100644 --- a/main/fskmodem_float.c +++ b/main/fskmodem_float.c @@ -34,7 +34,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <stdio.h> diff --git a/main/fskmodem_int.c b/main/fskmodem_int.c index cc720fe44..44ef928a8 100644 --- a/main/fskmodem_int.c +++ b/main/fskmodem_int.c @@ -34,7 +34,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/fskmodem.h" diff --git a/main/global_datastores.c b/main/global_datastores.c index 92c6bb4f7..dd1e0278e 100644 --- a/main/global_datastores.c +++ b/main/global_datastores.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/global_datastores.h" #include "asterisk/linkedlists.h" diff --git a/main/hashtab.c b/main/hashtab.c index a35af6718..27a700a9d 100644 --- a/main/hashtab.c +++ b/main/hashtab.c @@ -29,7 +29,7 @@ #define WRAP_LIBC_MALLOC #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <ctype.h> diff --git a/main/heap.c b/main/heap.c index c04f7a010..29f069b30 100644 --- a/main/heap.c +++ b/main/heap.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/heap.h" #include "asterisk/utils.h" diff --git a/main/http.c b/main/http.c index 26e218ba0..3a9d9ce9c 100644 --- a/main/http.c +++ b/main/http.c @@ -44,7 +44,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <time.h> #include <sys/time.h> diff --git a/main/image.c b/main/image.c index 118cd17c2..22c3a016c 100644 --- a/main/image.c +++ b/main/image.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <sys/time.h> #include <sys/stat.h> diff --git a/main/indications.c b/main/indications.c index 02a68b7ca..0f0e401d9 100644 --- a/main/indications.c +++ b/main/indications.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <math.h> @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <termios.h> #include <sys/ioctl.h> diff --git a/main/jitterbuf.c b/main/jitterbuf.c index 1bfe508da..0e93507ef 100644 --- a/main/jitterbuf.c +++ b/main/jitterbuf.c @@ -33,7 +33,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "jitterbuf.h" #include "asterisk/utils.h" diff --git a/main/json.c b/main/json.c index 35e6f16ce..12d5fc865 100644 --- a/main/json.c +++ b/main/json.c @@ -33,7 +33,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/json.h" #include "asterisk/localtime.h" diff --git a/main/libasteriskssl.c b/main/libasteriskssl.c index ca3fb569c..06790ffd0 100644 --- a/main/libasteriskssl.c +++ b/main/libasteriskssl.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #ifdef HAVE_OPENSSL #include <openssl/ssl.h> diff --git a/main/loader.c b/main/loader.c index eac38422c..26d229fdb 100644 --- a/main/loader.c +++ b/main/loader.c @@ -33,7 +33,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" #include "asterisk/paths.h" /* use ast_config_AST_MODULE_DIR */ diff --git a/main/lock.c b/main/lock.c index dd90d7bd9..13b8fb388 100644 --- a/main/lock.c +++ b/main/lock.c @@ -27,7 +27,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/utils.h" #include "asterisk/lock.h" diff --git a/main/logger.c b/main/logger.c index 29122b514..41f26e823 100644 --- a/main/logger.c +++ b/main/logger.c @@ -40,7 +40,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() /* When we include logger.h again it will trample on some stuff in syslog.h, but * nothing we care about in here. */ diff --git a/main/manager.c b/main/manager.c index d2d9896c2..4cfae75df 100644 --- a/main/manager.c +++ b/main/manager.c @@ -54,7 +54,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/paths.h" /* use various ast_config_AST_* */ #include <ctype.h> @@ -5979,9 +5979,6 @@ static int manager_modulecheck(struct mansession *s, const struct message *m) const char *module = astman_get_header(m, "Module"); const char *id = astman_get_header(m, "ActionID"); char idText[256]; -#if !defined(LOW_MEMORY) - const char *version; -#endif char filename[PATH_MAX]; char *cut; @@ -5998,11 +5995,6 @@ static int manager_modulecheck(struct mansession *s, const struct message *m) astman_send_error(s, m, "Module not loaded"); return 0; } - snprintf(cut, (sizeof(filename) - strlen(filename)) - 1, ".c"); - ast_debug(1, "**** ModuleCheck .c file %s\n", filename); -#if !defined(LOW_MEMORY) - version = ast_file_version_find(filename); -#endif if (!ast_strlen_zero(id)) { snprintf(idText, sizeof(idText), "ActionID: %s\r\n", id); @@ -6011,7 +6003,7 @@ static int manager_modulecheck(struct mansession *s, const struct message *m) } astman_append(s, "Response: Success\r\n%s", idText); #if !defined(LOW_MEMORY) - astman_append(s, "Version: %s\r\n\r\n", version ? version : ""); + astman_append(s, "Version: %s\r\n\r\n", ""); #endif return 0; } diff --git a/main/manager_bridges.c b/main/manager_bridges.c index e190baa83..dd3e98b8d 100644 --- a/main/manager_bridges.c +++ b/main/manager_bridges.c @@ -25,7 +25,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/stasis_bridges.h" #include "asterisk/stasis_channels.h" diff --git a/main/manager_channels.c b/main/manager_channels.c index 3aaab92d0..e459a7382 100644 --- a/main/manager_channels.c +++ b/main/manager_channels.c @@ -28,7 +28,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/callerid.h" #include "asterisk/channel.h" diff --git a/main/manager_endpoints.c b/main/manager_endpoints.c index 0d0866016..424e32108 100644 --- a/main/manager_endpoints.c +++ b/main/manager_endpoints.c @@ -28,7 +28,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/callerid.h" #include "asterisk/channel.h" diff --git a/main/manager_mwi.c b/main/manager_mwi.c index 8facc9093..7492f78a9 100644 --- a/main/manager_mwi.c +++ b/main/manager_mwi.c @@ -25,7 +25,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/manager.h" #include "asterisk/app.h" diff --git a/main/manager_system.c b/main/manager_system.c index b852c52e6..8417b7741 100644 --- a/main/manager_system.c +++ b/main/manager_system.c @@ -25,7 +25,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/stasis.h" #include "asterisk/stasis_message_router.h" diff --git a/main/md5.c b/main/md5.c index 5e79729b5..477494cca 100644 --- a/main/md5.c +++ b/main/md5.c @@ -22,7 +22,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/endian.h" #include "asterisk/md5.h" diff --git a/main/message.c b/main/message.c index 581487fcd..64cefcb1b 100644 --- a/main/message.c +++ b/main/message.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" diff --git a/main/mixmonitor.c b/main/mixmonitor.c index 9a6d86ca1..fff51849d 100644 --- a/main/mixmonitor.c +++ b/main/mixmonitor.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/lock.h" #include "asterisk/logger.h" diff --git a/main/named_acl.c b/main/named_acl.c index 3b81c8c38..0fc4df187 100644 --- a/main/named_acl.c +++ b/main/named_acl.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/config.h" #include "asterisk/config_options.h" diff --git a/main/netsock.c b/main/netsock.c index c11f14a89..568add4ca 100644 --- a/main/netsock.c +++ b/main/netsock.c @@ -31,7 +31,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #ifndef __linux__ #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__Darwin__) || defined(__GLIBC__) diff --git a/main/netsock2.c b/main/netsock2.c index 8d36805f9..d9123e434 100644 --- a/main/netsock2.c +++ b/main/netsock2.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/config.h" #include "asterisk/netsock2.h" diff --git a/main/optional_api.c b/main/optional_api.c index 92f36eaf9..d89b9acb2 100644 --- a/main/optional_api.c +++ b/main/optional_api.c @@ -18,7 +18,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/optional_api.h" #include "asterisk/utils.h" diff --git a/main/parking.c b/main/parking.c index f7f1dfb5c..25fdfe8f3 100644 --- a/main/parking.c +++ b/main/parking.c @@ -25,7 +25,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" #include "asterisk/astobj2.h" diff --git a/main/pbx.c b/main/pbx.c index 0573ab076..209de66d1 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" #include "asterisk/paths.h" /* use ast_config_AST_SYSTEM_NAME */ diff --git a/main/pickup.c b/main/pickup.c index 6f1e0f12f..8fb7e158b 100644 --- a/main/pickup.c +++ b/main/pickup.c @@ -47,7 +47,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/pickup.h" #include "asterisk/channel.h" diff --git a/main/plc.c b/main/plc.c index 1f0206920..b24322350 100644 --- a/main/plc.c +++ b/main/plc.c @@ -36,7 +36,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <math.h> diff --git a/main/presencestate.c b/main/presencestate.c index 4b3e94e61..32f19e6c8 100644 --- a/main/presencestate.c +++ b/main/presencestate.c @@ -57,7 +57,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" #include "asterisk/utils.h" diff --git a/main/privacy.c b/main/privacy.c index 8863f0996..7b13fe7a8 100644 --- a/main/privacy.c +++ b/main/privacy.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <sys/time.h> #include <signal.h> diff --git a/main/rtp_engine.c b/main/rtp_engine.c index e3ab52d3b..34e6a9439 100644 --- a/main/rtp_engine.c +++ b/main/rtp_engine.c @@ -137,7 +137,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <math.h> diff --git a/main/say.c b/main/say.c index ef80dfa7d..957929326 100644 --- a/main/say.c +++ b/main/say.c @@ -37,7 +37,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <netinet/in.h> #include <time.h> diff --git a/main/sched.c b/main/sched.c index 8fdbfed36..911143c9d 100644 --- a/main/sched.c +++ b/main/sched.c @@ -30,7 +30,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #ifdef DEBUG_SCHEDULER #define DEBUG(a) do { \ diff --git a/main/sdp_srtp.c b/main/sdp_srtp.c index fee3fea56..8c86f1407 100644 --- a/main/sdp_srtp.c +++ b/main/sdp_srtp.c @@ -32,7 +32,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <math.h> #include "asterisk/options.h" diff --git a/main/security_events.c b/main/security_events.c index 5a8df66d1..0da62a20a 100644 --- a/main/security_events.c +++ b/main/security_events.c @@ -362,7 +362,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/utils.h" #include "asterisk/strings.h" diff --git a/main/sem.c b/main/sem.c index 7315165d7..ea2273d5a 100644 --- a/main/sem.c +++ b/main/sem.c @@ -23,7 +23,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/sem.h" #include "asterisk/utils.h" diff --git a/main/slinfactory.c b/main/slinfactory.c index 8c117d652..9b6824168 100644 --- a/main/slinfactory.c +++ b/main/slinfactory.c @@ -30,7 +30,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/frame.h" #include "asterisk/format_cache.h" diff --git a/main/smoother.c b/main/smoother.c index 720ad8549..ca0c4e45a 100644 --- a/main/smoother.c +++ b/main/smoother.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" #include "asterisk/frame.h" diff --git a/main/sorcery.c b/main/sorcery.c index d3d6f3d7d..1a4b3a072 100644 --- a/main/sorcery.c +++ b/main/sorcery.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/logger.h" #include "asterisk/sorcery.h" diff --git a/main/srv.c b/main/srv.c index 0938a0c03..c07974991 100644 --- a/main/srv.c +++ b/main/srv.c @@ -35,7 +35,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <netinet/in.h> #include <arpa/nameser.h> diff --git a/main/stasis.c b/main/stasis.c index c2d552e4b..6a5926546 100644 --- a/main/stasis.c +++ b/main/stasis.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$"); +ASTERISK_REGISTER_FILE(); #include "asterisk/astobj2.h" #include "asterisk/stasis_internal.h" diff --git a/main/stasis_bridges.c b/main/stasis_bridges.c index 183855773..d06ee14a7 100644 --- a/main/stasis_bridges.c +++ b/main/stasis_bridges.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/astobj2.h" #include "asterisk/stasis.h" diff --git a/main/stasis_cache.c b/main/stasis_cache.c index 9129c0064..bd6d6fa1d 100644 --- a/main/stasis_cache.c +++ b/main/stasis_cache.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/astobj2.h" #include "asterisk/hashtab.h" diff --git a/main/stasis_cache_pattern.c b/main/stasis_cache_pattern.c index 9e3de367a..bbe63ba1d 100644 --- a/main/stasis_cache_pattern.c +++ b/main/stasis_cache_pattern.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/astobj2.h" #include "asterisk/stasis_cache_pattern.h" diff --git a/main/stasis_channels.c b/main/stasis_channels.c index 968afbd7d..5990cddce 100644 --- a/main/stasis_channels.c +++ b/main/stasis_channels.c @@ -30,7 +30,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/astobj2.h" #include "asterisk/json.h" diff --git a/main/stasis_endpoints.c b/main/stasis_endpoints.c index 737468177..f19bb91fe 100644 --- a/main/stasis_endpoints.c +++ b/main/stasis_endpoints.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/astobj2.h" #include "asterisk/stasis.h" diff --git a/main/stasis_message.c b/main/stasis_message.c index c797cdfa0..0e6ff9204 100644 --- a/main/stasis_message.c +++ b/main/stasis_message.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/astobj2.h" #include "asterisk/stasis.h" diff --git a/main/stasis_message_router.c b/main/stasis_message_router.c index 26df76c53..f60180d68 100644 --- a/main/stasis_message_router.c +++ b/main/stasis_message_router.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/astobj2.h" #include "asterisk/stasis_message_router.h" diff --git a/main/stasis_system.c b/main/stasis_system.c index e232b8e8a..7e449b544 100644 --- a/main/stasis_system.c +++ b/main/stasis_system.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/astobj2.h" #include "asterisk/stasis.h" diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c index 4b005207e..927d473fd 100644 --- a/main/stdtime/localtime.c +++ b/main/stdtime/localtime.c @@ -50,7 +50,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <signal.h> #include <sys/stat.h> diff --git a/main/strings.c b/main/strings.c index da63cdfc0..7aaff7992 100644 --- a/main/strings.c +++ b/main/strings.c @@ -37,7 +37,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/strings.h" #include "asterisk/pbx.h" diff --git a/main/stun.c b/main/stun.c index f5bdc9ad4..ecabdadef 100644 --- a/main/stun.c +++ b/main/stun.c @@ -32,7 +32,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" #include "asterisk/stun.h" diff --git a/main/syslog.c b/main/syslog.c index 51da69a8c..3f493064b 100644 --- a/main/syslog.c +++ b/main/syslog.c @@ -30,7 +30,7 @@ #include "asterisk/utils.h" #include "asterisk/syslog.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <syslog.h> diff --git a/main/taskprocessor.c b/main/taskprocessor.c index dd416dbae..87302538d 100644 --- a/main/taskprocessor.c +++ b/main/taskprocessor.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" #include "asterisk/module.h" diff --git a/main/tcptls.c b/main/tcptls.c index 92fee604d..ddeeeeaba 100644 --- a/main/tcptls.c +++ b/main/tcptls.c @@ -31,7 +31,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #ifdef HAVE_FCNTL_H #include <fcntl.h> diff --git a/main/tdd.c b/main/tdd.c index eee3f0e73..7f0d7e310 100644 --- a/main/tdd.c +++ b/main/tdd.c @@ -33,7 +33,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <time.h> #include <math.h> diff --git a/main/term.c b/main/term.c index 2e28032a7..a19c1f144 100644 --- a/main/term.c +++ b/main/term.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" #include <sys/time.h> diff --git a/main/test.c b/main/test.c index f64a572fd..47ae7f8f7 100644 --- a/main/test.c +++ b/main/test.c @@ -31,7 +31,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$"); +ASTERISK_REGISTER_FILE(); #include "asterisk/_private.h" diff --git a/main/threadstorage.c b/main/threadstorage.c index 4c46a0f58..920b2d509 100644 --- a/main/threadstorage.c +++ b/main/threadstorage.c @@ -38,7 +38,7 @@ void threadstorage_init(void) #else /* !defined(DEBUG_THREADLOCALS) */ -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/strings.h" #include "asterisk/utils.h" diff --git a/main/timing.c b/main/timing.c index ae8c3ebff..e2e28f04f 100644 --- a/main/timing.c +++ b/main/timing.c @@ -31,7 +31,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" diff --git a/main/translate.c b/main/translate.c index 2b11d7b4a..f13ecf456 100644 --- a/main/translate.c +++ b/main/translate.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <sys/time.h> #include <sys/resource.h> diff --git a/main/udptl.c b/main/udptl.c index 4e878195c..c059ad3a4 100644 --- a/main/udptl.c +++ b/main/udptl.c @@ -63,7 +63,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <sys/time.h> #include <signal.h> diff --git a/main/ulaw.c b/main/ulaw.c index 76e4b0419..08d8060c8 100644 --- a/main/ulaw.c +++ b/main/ulaw.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/ulaw.h" #include "asterisk/logger.h" diff --git a/main/utils.c b/main/utils.c index 888aaab81..b1b7ac9af 100644 --- a/main/utils.c +++ b/main/utils.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include <ctype.h> #include <fcntl.h> diff --git a/main/xml.c b/main/xml.c index dee249711..72d5821c1 100644 --- a/main/xml.c +++ b/main/xml.c @@ -31,7 +31,7 @@ #include "asterisk/utils.h" #include "asterisk/autoconfig.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #if defined(HAVE_LIBXML2) #include <libxml/parser.h> diff --git a/main/xmldoc.c b/main/xmldoc.c index fcf1b2cac..399a7be97 100644 --- a/main/xmldoc.c +++ b/main/xmldoc.c @@ -29,7 +29,7 @@ #include "asterisk.h" -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +ASTERISK_REGISTER_FILE() #include "asterisk/_private.h" #include "asterisk/paths.h" |