kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-19 16:20:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

convert ast_build_str to ast_str_*

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48516 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-12-16 09:46:20 +00:00
parent 20b382cfff
commit c1220dd27e
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
main/translate.c
View File

@@ -525,12 +525,9 @@ static int show_translation(int fd, int argc, char *argv[])
longest = curlen; longest = curlen;
} }
for (x = -1; x < SHOW_TRANS; x++) { for (x = -1; x < SHOW_TRANS; x++) {
char line[120]; struct ast_str *out = ast_str_alloca(120);
char *buf = line;
size_t left = sizeof(line) - 1; /* one initial space */ ast_str_set(&out, -1, " ");
/* next 2 lines run faster than using ast_build_string() */
*buf++ = ' ';
*buf = '\0';
for (y = -1; y < SHOW_TRANS; y++) { for (y = -1; y < SHOW_TRANS; y++) {
curlen = strlen(ast_getformatname(1 << (y))); curlen = strlen(ast_getformatname(1 << (y)));
@@ -538,21 +535,21 @@ static int show_translation(int fd, int argc, char *argv[])
/* XXX 999 is a little hackish /* XXX 999 is a little hackish
We don't want this number being larger than the shortest (or current) codec We don't want this number being larger than the shortest (or current) codec
For now, that is "gsm" */ For now, that is "gsm" */
ast_build_string(&buf, &left, "%*d", curlen + 1, tr_matrix[x][y].cost > 999 ? 0 : tr_matrix[x][y].cost); ast_str_append(&out, -1, "%*d", curlen + 1, tr_matrix[x][y].cost > 999 ? 0 : tr_matrix[x][y].cost);
} else if (x == -1 && y >= 0) { } else if (x == -1 && y >= 0) {
/* Top row - use a dynamic size */ /* Top row - use a dynamic size */
ast_build_string(&buf, &left, "%*s", curlen + 1, ast_getformatname(1 << (x + y + 1)) ); ast_str_append(&out, -1, "%*s", curlen + 1, ast_getformatname(1 << (x + y + 1)) );
} else if (y == -1 && x >= 0) { } else if (y == -1 && x >= 0) {
/* Left column - use a static size. */ /* Left column - use a static size. */
ast_build_string(&buf, &left, "%*s", longest, ast_getformatname(1 << (x + y + 1)) ); ast_str_append(&out, -1, "%*s", longest, ast_getformatname(1 << (x + y + 1)) );
} else if (x >= 0 && y >= 0) { } else if (x >= 0 && y >= 0) {
ast_build_string(&buf, &left, "%*s", curlen + 1, "-"); ast_str_append(&out, -1, "%*s", curlen + 1, "-");
} else { } else {
ast_build_string(&buf, &left, "%*s", longest, ""); ast_str_append(&out, -1, "%*s", longest, "");
} }
} }
ast_build_string(&buf, &left, "\n"); ast_str_append(&out, -1, "\n");
ast_cli(fd, line); ast_cli(fd, out->str);
} }
AST_RWLIST_UNLOCK(&translators); AST_RWLIST_UNLOCK(&translators);
return RESULT_SUCCESS; return RESULT_SUCCESS;