diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-07-26 15:49:18 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-07-26 15:49:18 +0000 |
| commit | f8483a0d04f73e9d4c4f665efd5397cf96b17510 (patch) | |
| tree | de4bd130dafa592858306d2ac6bcc5f85fd51cc8 /main/loader.c | |
| parent | 51e7035dfeca1def3070ca65f18153ee1d340ba9 (diff) | |
Do a massive conversion for using the ast_verb() macro
(closes issue #10277, patches by mvanbaak)
Basically, this changes ...
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3, "Something\n");
to ...
ast_verb(3, "Something\n");
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77299 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/loader.c')
| -rw-r--r-- | main/loader.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/main/loader.c b/main/loader.c index 2e6457285..f3db6841c 100644 --- a/main/loader.c +++ b/main/loader.c @@ -583,8 +583,7 @@ int ast_module_reload(const char *name) } res = 2; - if (option_verbose > 2) - ast_verbose(VERBOSE_PREFIX_3 "Reloading module '%s' (%s)\n", cur->resource, info->description); + ast_verb(3, "Reloading module '%s' (%s)\n", cur->resource, info->description); info->reload(); } AST_LIST_UNLOCK(&module_list); @@ -665,13 +664,11 @@ static enum ast_module_load_result load_resource(const char *resource_name, unsi switch (res) { case AST_MODULE_LOAD_SUCCESS: if (!ast_fully_booted) { - if (option_verbose) - ast_verbose("%s => (%s)\n", resource_name, term_color(tmp, mod->info->description, COLOR_BROWN, COLOR_BLACK, sizeof(tmp))); + ast_verb(1, "%s => (%s)\n", resource_name, term_color(tmp, mod->info->description, COLOR_BROWN, COLOR_BLACK, sizeof(tmp))); if (ast_opt_console && !option_verbose) ast_verbose( "."); } else { - if (option_verbose) - ast_verbose(VERBOSE_PREFIX_1 "Loaded %s => (%s)\n", resource_name, mod->info->description); + ast_verb(1, "Loaded %s => (%s)\n", resource_name, mod->info->description); } mod->flags.running = 1; @@ -742,8 +739,7 @@ int load_modules(unsigned int preload_only) /* all embedded modules have registered themselves by now */ embedding = 0; - if (option_verbose) - ast_verbose("Asterisk Dynamic Loader Starting:\n"); + ast_verb(1, "Asterisk Dynamic Loader Starting:\n"); AST_LIST_HEAD_INIT_NOLOCK(&load_order); |