kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_parking: Cleanup find_channel_parking_lot_name() usage." into 13

Browse Source
This commit is contained in:
zuul
2016-03-26 11:33:00 -05:00
committed by Gerrit Code Review
parent 6f95b5eda1 05fc3a96d1
commit 3974bf1ef0
4 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
res/res_parking.c
View File

@@ -613,14 +613,13 @@ const char *find_channel_parking_lot_name(struct ast_channel *chan)
/* The channel variable overrides everything */
name = pbx_builtin_getvar_helper(chan, "PARKINGLOT");
if (ast_strlen_zero(name) && !ast_strlen_zero(ast_channel_parkinglot(chan))) {
/* Use the channel's parking lot. */
name = ast_channel_parkinglot(chan);
}
/* If the name couldn't be pulled from that either, use the default parking lot name. */
if (ast_strlen_zero(name)) {
name = DEFAULT_PARKING_LOT;
/* Try the channel's parking lot. */
name = ast_channel_parkinglot(chan);
if (ast_strlen_zero(name)) {
/* Fall back to the default parking lot. */
name = DEFAULT_PARKING_LOT;
}
}
return name;