diff options
| author | Russell Bryant <russell@russellbryant.com> | 2005-07-28 21:16:02 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2005-07-28 21:16:02 +0000 |
| commit | 654ff10f8ef52173fbaf1c9af7aa77a3aab3533b (patch) | |
| tree | 716bc9846517d368f5447c16d50695c1d0947142 /funcs | |
| parent | 86ec024624d3c52957f779ea4974a2ab73a514ed (diff) | |
make GROUP set group@categroy instead of category@group
ensure that GROUP_COUNT still returns "0", even if no group was found
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6245 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'funcs')
| -rwxr-xr-x | funcs/func_groupcount.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/funcs/func_groupcount.c b/funcs/func_groupcount.c index 66a7367ac..54e6e1084 100755 --- a/funcs/func_groupcount.c +++ b/funcs/func_groupcount.c @@ -36,7 +36,7 @@ static char *group_count_function_read(struct ast_channel *chan, char *cmd, char if ((grp = pbx_builtin_getvar_helper(chan, category))) ast_copy_string(group, grp, sizeof(group)); else - return buf; + ast_log(LOG_NOTICE, "No group could be found for channel '%s'\n", chan->name); } count = ast_app_group_get_count(group, category); @@ -109,7 +109,7 @@ static void group_function_write(struct ast_channel *chan, char *cmd, char *data char grpcat[256]; if (data && !ast_strlen_zero(data)) { - snprintf(grpcat, sizeof(grpcat), "%s@%s", data, value); + snprintf(grpcat, sizeof(grpcat), "%s@%s", value, data); } else { ast_copy_string(grpcat, value, sizeof(grpcat)); } |