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

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

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@167432 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2009-01-07 17:29:53 +00:00
parent 5eca294b65
commit 24ccfad6dc
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
main/indications.c
View File

@@ -373,13 +373,10 @@ struct ind_tone_zone *ast_get_indication_zone(const char *country)
struct ind_tone_zone *tz;
int alias_loop = 0;
/* we need some tonezone, pick the first */
if (country == NULL && current_tonezone)
return current_tonezone; /* default country? */
if (country == NULL && ind_tone_zones)
return ind_tone_zones; /* any country? */
if (country == NULL)
return 0; /* not a single country insight */
if (ast_strlen_zero(country)) {
/* No country specified? Return the default or the first in the list */
return current_tonezone ? current_tonezone : ind_tone_zones;
}
ast_mutex_lock(&tzlock);
do {