diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-10-11 19:03:06 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-10-11 19:03:06 +0000 |
| commit | e97a723cf1710d0c40bcbe7ac53fc943abedd2c4 (patch) | |
| tree | 44dcb2c14abed6932db4f248b17626a01a38f59b /main/file.c | |
| parent | 8a52c889883f2013e377d87389f07aec5b781122 (diff) | |
Merge a ton of NEW_CLI conversions. Thanks to everyone that helped out! :)
(closes issue #10724)
Reported by: eliel
Patches:
chan_skinny.c.patch uploaded by eliel (license 64)
chan_oss.c.patch uploaded by eliel (license 64)
chan_mgcp.c.patch2 uploaded by eliel (license 64)
pbx_config.c.patch uploaded by seanbright (license 71)
iax2-provision.c.patch uploaded by eliel (license 64)
chan_gtalk.c.patch uploaded by eliel (license 64)
pbx_ael.c.patch uploaded by seanbright (license 71)
file.c.patch uploaded by seanbright (license 71)
image.c.patch uploaded by seanbright (license 71)
cli.c.patch uploaded by moy (license 222)
astobj2.c.patch uploaded by moy (license 222)
asterisk.c.patch uploaded by moy (license 222)
res_limit.c.patch uploaded by seanbright (license 71)
res_convert.c.patch uploaded by seanbright (license 71)
res_crypto.c.patch uploaded by seanbright (license 71)
app_osplookup.c.patch uploaded by seanbright (license 71)
app_rpt.c.patch uploaded by seanbright (license 71)
app_mixmonitor.c.patch uploaded by seanbright (license 71)
channel.c.patch uploaded by seanbright (license 71)
translate.c.patch uploaded by seanbright (license 71)
udptl.c.patch uploaded by seanbright (license 71)
threadstorage.c.patch uploaded by seanbright (license 71)
db.c.patch uploaded by seanbright (license 71)
cdr.c.patch uploaded by moy (license 222)
pbd_dundi.c.patch uploaded by moy (license 222)
app_osplookup-rev83558.patch uploaded by moy (license 222)
res_clioriginate.c.patch uploaded by moy (license 222)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85460 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/file.c')
| -rw-r--r-- | main/file.c | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/main/file.c b/main/file.c index 19f50bf81..93763c872 100644 --- a/main/file.c +++ b/main/file.c @@ -1202,37 +1202,44 @@ int ast_stream_and_wait(struct ast_channel *chan, const char *file, const char * return res; } -static int show_file_formats(int fd, int argc, char *argv[]) +static char *handle_cli_core_show_file_formats(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { #define FORMAT "%-10s %-10s %-20s\n" #define FORMAT2 "%-10s %-10s %-20s\n" struct ast_format *f; int count_fmt = 0; - if (argc != 4) - return RESULT_SHOWUSAGE; - ast_cli(fd, FORMAT, "Format", "Name", "Extensions"); + switch (cmd) { + case CLI_INIT: + e->command = "core show file formats"; + e->usage = + "Usage: core show file formats\n" + " Displays currently registered file formats (if any).\n"; + return NULL; + case CLI_GENERATE: + return NULL; + } + + if (a->argc != 4) + return CLI_SHOWUSAGE; + + ast_cli(a->fd, FORMAT, "Format", "Name", "Extensions"); + ast_cli(a->fd, FORMAT, "------", "----", "----------"); AST_RWLIST_RDLOCK(&formats); AST_RWLIST_TRAVERSE(&formats, f, list) { - ast_cli(fd, FORMAT2, ast_getformatname(f->format), f->name, f->exts); + ast_cli(a->fd, FORMAT2, ast_getformatname(f->format), f->name, f->exts); count_fmt++; } AST_RWLIST_UNLOCK(&formats); - ast_cli(fd, "%d file formats registered.\n", count_fmt); - return RESULT_SUCCESS; + ast_cli(a->fd, "%d file formats registered.\n", count_fmt); + return CLI_SUCCESS; #undef FORMAT #undef FORMAT2 } -static const char show_file_formats_usage[] = -"Usage: core show file formats\n" -" Displays currently registered file formats (if any)\n"; - struct ast_cli_entry cli_file[] = { - { { "core", "show", "file", "formats" }, - show_file_formats, "Displays file formats", - show_file_formats_usage }, + NEW_CLI(handle_cli_core_show_file_formats, "Displays file formats") }; int ast_file_init(void) |