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

Merged revisions 167432 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r167432 | russell | 2009-01-07 11:29:53 -0600 (Wed, 07 Jan 2009) | 4 lines

Treat an empty string the same way as a NULL country argument.

In passing, simplify the handling of returning a default tone zone.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@167442 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2009-01-07 17:35:39 +00:00
parent 08e142b1e7
commit 8ccb6795e9
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main/indications.c
View File

@@ -383,11 +383,8 @@ struct ind_tone_zone *ast_get_indication_zone(const char *country)
AST_RWLIST_RDLOCK(&tone_zones);
if (!country) {
if (current_tonezone)
tz = current_tonezone;
else
tz = AST_LIST_FIRST(&tone_zones);
if (ast_strlen_zero(country)) {
tz = current_tonezone ? current_tonezone : AST_LIST_FIRST(&tone_zones);
} else {
do {
AST_RWLIST_TRAVERSE(&tone_zones, tz, list) {