diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-10-11 19:03:06 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-10-11 19:03:06 +0000 |
| commit | 13b9c5237c9f5b8b3d72634d575665b1d1147ba3 (patch) | |
| tree | 44dcb2c14abed6932db4f248b17626a01a38f59b /main/image.c | |
| parent | a8506328befc2a11643cea88772609610ec11c33 (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: http://svn.digium.com/svn/asterisk/trunk@85460 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/image.c')
| -rw-r--r-- | main/image.c | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/main/image.c b/main/image.c index 718d463a9..0530ec5a4 100644 --- a/main/image.c +++ b/main/image.c @@ -179,27 +179,39 @@ int ast_send_image(struct ast_channel *chan, char *filename) return res; } -static int show_image_formats(int fd, int argc, char *argv[]) +static char *handle_core_show_image_formats(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { #define FORMAT "%10s %10s %50s %10s\n" #define FORMAT2 "%10s %10s %50s %10s\n" struct ast_imager *i; - if (argc != 4) - return RESULT_SHOWUSAGE; - ast_cli(fd, FORMAT, "Name", "Extensions", "Description", "Format"); + int count_fmt = 0; + + switch (cmd) { + case CLI_INIT: + e->command = "core show image formats"; + e->usage = + "Usage: core show image formats\n" + " Displays currently registered image formats (if any).\n"; + return NULL; + case CLI_GENERATE: + return NULL; + } + if (a->argc != 4) + return CLI_SHOWUSAGE; + ast_cli(a->fd, FORMAT, "Name", "Extensions", "Description", "Format"); + ast_cli(a->fd, FORMAT, "----", "----------", "-----------", "------"); AST_RWLIST_RDLOCK(&imagers); AST_RWLIST_TRAVERSE(&imagers, i, list) { - ast_cli(fd, FORMAT2, i->name, i->exts, i->desc, ast_getformatname(i->format)); + ast_cli(a->fd, FORMAT2, i->name, i->exts, i->desc, ast_getformatname(i->format)); + count_fmt++; } AST_RWLIST_UNLOCK(&imagers); - return RESULT_SUCCESS; + ast_cli(a->fd, "\n%d image format%s registered.\n", count_fmt, count_fmt == 1 ? "" : "s"); + return CLI_SUCCESS; } struct ast_cli_entry cli_image[] = { - { { "core", "show", "image", "formats" }, - show_image_formats, "Displays image formats", - "Usage: core show image formats\n" - " displays currently registered image formats (if any)\n" }, + NEW_CLI(handle_core_show_image_formats, "Displays image formats") }; int ast_image_init(void) |