From c18ca36147ae4b597f38a8ddf5c6c54efb9984b8 Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Mon, 17 Dec 2007 22:50:49 +0000
Subject: [PATCH] Merged revisions 93381 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r93381 | qwell | 2007-12-17 16:45:57 -0600 (Mon, 17 Dec 2007) | 4 lines
What was I thinking when I wrote this masterpiece?
-1 + 1 = 0.. who woulda thunk it?.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@93390 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/translate.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/main/translate.c b/main/translate.c
index 0d04a99662..9c5da5c805 100644
--- a/main/translate.c
+++ b/main/translate.c
@@ -531,7 +531,7 @@ static char *handle_cli_core_show_translation(struct ast_cli_entry *e, int cmd,
ast_cli(a->fd, " Source Format (Rows) Destination Format (Columns)\n\n");
/* Get the length of the longest (usable?) codec name, so we know how wide the left side should be */
for (x = 0; x < SHOW_TRANS; x++) {
- curlen = strlen(ast_getformatname(1 << (x + 1)));
+ curlen = strlen(ast_getformatname(1 << (x)));
if (curlen > longest)
longest = curlen;
}
@@ -540,7 +540,8 @@ static char *handle_cli_core_show_translation(struct ast_cli_entry *e, int cmd,
ast_str_set(&out, -1, " ");
for (y = -1; y < SHOW_TRANS; y++) {
- curlen = strlen(ast_getformatname(1 << (y)));
+ if (y >= 0)
+ curlen = strlen(ast_getformatname(1 << (y)));
if (curlen < 5)
curlen = 5;
if (x >= 0 && y >= 0 && tr_matrix[x][y].step) {
@@ -550,10 +551,10 @@ static char *handle_cli_core_show_translation(struct ast_cli_entry *e, int cmd,
ast_str_append(&out, -1, "%*d", curlen + 1, tr_matrix[x][y].cost > 99999 ? 0 : tr_matrix[x][y].cost);
} else if (x == -1 && y >= 0) {
/* Top row - use a dynamic size */
- ast_str_append(&out, -1, "%*s", curlen + 1, ast_getformatname(1 << (x + y + 1)) );
+ ast_str_append(&out, -1, "%*s", curlen + 1, ast_getformatname(1 << (y)) );
} else if (y == -1 && x >= 0) {
/* Left column - use a static size. */
- ast_str_append(&out, -1, "%*s", longest, ast_getformatname(1 << (x + y + 1)) );
+ ast_str_append(&out, -1, "%*s", longest, ast_getformatname(1 << (x)) );
} else if (x >= 0 && y >= 0) {
ast_str_append(&out, -1, "%*s", curlen + 1, "-");
} else {
--
GitLab