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

Merge "manager_channels.c: Reordered ast_manager_build_channel_state_string_prefix()" into 13

Browse Source
This commit is contained in:
Jenkins2
2018-02-03 10:03:18 -06:00
committed by Gerrit Code Review
parent 4bc5291878 ef1aeb9437
commit 65c8b7d6b4
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
main/manager_channels.c
View File

@@ -463,16 +463,17 @@ struct ast_str *ast_manager_build_channel_state_string_prefix(
const struct ast_channel_snapshot *snapshot, const struct ast_channel_snapshot *snapshot,
const char *prefix) const char *prefix)
{ {
struct ast_str *out = ast_str_create(1024); struct ast_str *out;
int res = 0; char *caller_name;
char *caller_name, *connected_name; char *connected_name;
int res;
if (!out) { if (snapshot->tech_properties & AST_CHAN_TP_INTERNAL) {
return NULL; return NULL;
} }
if (snapshot->tech_properties & AST_CHAN_TP_INTERNAL) { out = ast_str_create(1024);
ast_free(out); if (!out) {
return NULL; return NULL;
} }
@@ -509,10 +510,11 @@ struct ast_str *ast_manager_build_channel_state_string_prefix(
prefix, snapshot->uniqueid, prefix, snapshot->uniqueid,
prefix, snapshot->linkedid); prefix, snapshot->linkedid);
if (!res) {
ast_free(out);
ast_free(caller_name); ast_free(caller_name);
ast_free(connected_name); ast_free(connected_name);
if (!res) {
ast_free(out);
return NULL; return NULL;
} }
@@ -528,9 +530,6 @@ struct ast_str *ast_manager_build_channel_state_string_prefix(
} }
} }
ast_free(caller_name);
ast_free(connected_name);
return out; return out;
} }