sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uri.c: Simplify ast_uri_make_host_with_port()

This commit is contained in:
Sean Bright 2023-11-09 18:06:22 -05:00 committed by asterisk-org-access-app[bot]
parent 0b744cef15
commit 31c44d0634
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
main/uri.c
View File

@ -299,25 +299,14 @@ struct ast_uri *ast_uri_parse_websocket(const char *uri)
char *ast_uri_make_host_with_port(const struct ast_uri *uri)
{
int host_size = ast_uri_host(uri) ?
strlen(ast_uri_host(uri)) : 0;
/* if there is a port +1 for the colon */
int port_size = ast_uri_port(uri) ?
strlen(ast_uri_port(uri)) + 1 : 0;
char *res = ast_malloc(host_size + port_size + 1);
char *res;
if (!res) {
if (ast_asprintf(&res, "%s%s%s",
ast_uri_host(uri) ?: "",
ast_uri_port(uri) ? ":" : "",
ast_uri_port(uri) ?: "") == -1) {
return NULL;
}
memcpy(res, ast_uri_host(uri), host_size);
if (ast_uri_port(uri)) {
res[host_size] = ':';
memcpy(res + host_size + 1,
ast_uri_port(uri), port_size - 1);
}
res[host_size + port_size] = '\0';
return res;
}