Janitor work converting !ast_strlen_zero(a)?a:b

to S_OR functions. from bug note 6805 with minor
modifications.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@15283 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matt O'Gorman
2006-03-27 19:31:54 +00:00
parent f274b642aa
commit a5ece3388a
14 changed files with 38 additions and 37 deletions

4
app.c
View File

@@ -1059,7 +1059,7 @@ int ast_app_group_get_count(const char *group, const char *category)
if (ast_strlen_zero(group))
return 0;
s = (!ast_strlen_zero(category)) ? category : GROUP_CATEGORY_PREFIX;
s = S_OR(category, GROUP_CATEGORY_PREFIX);
ast_copy_string(cat, s, sizeof(cat));
chan = NULL;
@@ -1089,7 +1089,7 @@ int ast_app_group_match_get_count(const char *groupmatch, const char *category)
if (regcomp(&regexbuf, groupmatch, REG_EXTENDED | REG_NOSUB))
return 0;
s = (!ast_strlen_zero(category)) ? category : GROUP_CATEGORY_PREFIX;
s = S_OR(category, GROUP_CATEGORY_PREFIX);
ast_copy_string(cat, s, sizeof(cat));
chan = NULL;