diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-26 15:49:18 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-26 15:49:18 +0000 |
| commit | 4f3c4dc7f238b64a21172be86266311c9c645c77 (patch) | |
| tree | de4bd130dafa592858306d2ac6bcc5f85fd51cc8 /main/file.c | |
| parent | 07772bc9e3ef6636a3e99e07d2aea3a06988f0c9 (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: http://svn.digium.com/svn/asterisk/trunk@77299 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/file.c')
| -rw-r--r-- | main/file.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/main/file.c b/main/file.c index 699df5aa9..94760b89c 100644 --- a/main/file.c +++ b/main/file.c @@ -97,8 +97,7 @@ int __ast_format_register(const struct ast_format *f, struct ast_module *mod) AST_RWLIST_INSERT_HEAD(&formats, tmp, list); AST_RWLIST_UNLOCK(&formats); - if (option_verbose > 1) - ast_verbose( VERBOSE_PREFIX_2 "Registered file format %s, extension(s) %s\n", f->name, f->exts); + ast_verb(2, "Registered file format %s, extension(s) %s\n", f->name, f->exts); return 0; } @@ -119,10 +118,9 @@ int ast_format_unregister(const char *name) AST_RWLIST_TRAVERSE_SAFE_END AST_RWLIST_UNLOCK(&formats); - if (!res) { - if (option_verbose > 1) - ast_verbose( VERBOSE_PREFIX_2 "Unregistered format %s\n", name); - } else + if (!res) + ast_verb(2, "Unregistered format %s\n", name); + else ast_log(LOG_WARNING, "Tried to unregister format %s, already unregistered\n", name); return res; @@ -797,8 +795,7 @@ int ast_streamfile(struct ast_channel *chan, const char *filename, const char *p ast_playstream(fs); if (vfs) ast_playstream(vfs); - if (option_verbose > 2) - ast_verbose(VERBOSE_PREFIX_3 "<%s> Playing '%s.%s' (language '%s')\n", chan->name, filename, ast_getformatname(chan->writeformat), preflang ? preflang : "default"); + ast_verb(3, "<%s> Playing '%s.%s' (language '%s')\n", chan->name, filename, ast_getformatname(chan->writeformat), preflang ? preflang : "default"); return 0; } |