Merged revisions 167442 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
r167442 | russell | 2009-01-07 11:35:39 -0600 (Wed, 07 Jan 2009) | 12 lines

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/branches/1.6.1@167456 65c4cc65-6c06-0410-ace0-fbb531ad65f3

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 (ast_strlen_zero(country)) {
-		if (current_tonezone)
+		tz = current_tonezone ? current_tonezone : AST_LIST_FIRST(&tone_zones);
-			tz = current_tonezone;
-		else
-			tz = AST_LIST_FIRST(&tone_zones);
 	} else {
 		do {
 			AST_RWLIST_TRAVERSE(&tone_zones, tz, list) {