From 8ccb6795e9974b4fd018f1fbdad9e9cc4a1cb88d Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 7 Jan 2009 17:35:39 +0000
Subject: [PATCH] Merged revisions 167432 via svnmerge from
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
---
main/indications.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/main/indications.c b/main/indications.c
index e1ec4e2935..2057fd3211 100644
--- a/main/indications.c
+++ b/main/indications.c
@@ -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) {