diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-12 04:28:58 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-12 04:28:58 +0000 |
commit | 5d9ed5739aab2b302efc178d21e6c75672369db3 (patch) | |
tree | 5c4270c1ac3d265b96361d98722a75b947f2f8c6 /funcs/func_groupcount.c | |
parent | 9f87dd693e9e74816b913a157fdcdefa3d7a2e56 (diff) |
major dialplan functions update
deprecate LANGUAGE() and MUSICCLASS(), in favor of CHANNEL()
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9674 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs/func_groupcount.c')
-rw-r--r-- | funcs/func_groupcount.c | 83 |
1 files changed, 49 insertions, 34 deletions
diff --git a/funcs/func_groupcount.c b/funcs/func_groupcount.c index a4a133056..deb29541c 100644 --- a/funcs/func_groupcount.c +++ b/funcs/func_groupcount.c @@ -1,7 +1,7 @@ /* * Asterisk -- An open source telephony toolkit. * - * Copyright (C) 1999 - 2005, Digium, Inc. + * Copyright (C) 1999 - 2006, Digium, Inc. * * See http://www.asterisk.org for more information about * the Asterisk project. Please do not directly contact @@ -36,70 +36,81 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/utils.h" #include "asterisk/app.h" -static char *group_count_function_read(struct ast_channel *chan, char *cmd, char *data, char *buf, size_t len) +static int group_count_function_read(struct ast_channel *chan, char *cmd, + char *data, char *buf, size_t len) { int count; char group[80] = ""; char category[80] = ""; const char *grp; - ast_app_group_split_group(data, group, sizeof(group), category, sizeof(category)); + ast_app_group_split_group(data, group, sizeof(group), category, + sizeof(category)); if (ast_strlen_zero(group)) { if ((grp = pbx_builtin_getvar_helper(chan, category))) ast_copy_string(group, grp, sizeof(group)); else - ast_log(LOG_NOTICE, "No group could be found for channel '%s'\n", chan->name); + ast_log(LOG_NOTICE, "No group could be found for channel '%s'\n", + chan->name); } count = ast_app_group_get_count(group, category); snprintf(buf, len, "%d", count); - return buf; + return 0; } static struct ast_custom_function group_count_function = { .name = "GROUP_COUNT", .syntax = "GROUP_COUNT([groupname][@category])", .synopsis = "Counts the number of channels in the specified group", - .desc = "Calculates the group count for the specified group, or uses the\n" - "channel's current group if not specifed (and non-empty).\n", + .desc = + "Calculates the group count for the specified group, or uses the\n" + "channel's current group if not specifed (and non-empty).\n", .read = group_count_function_read, }; -static char *group_match_count_function_read(struct ast_channel *chan, char *cmd, char *data, char *buf, size_t len) +static int group_match_count_function_read(struct ast_channel *chan, + char *cmd, char *data, char *buf, + size_t len) { int count; char group[80] = ""; char category[80] = ""; - ast_app_group_split_group(data, group, sizeof(group), category, sizeof(category)); + ast_app_group_split_group(data, group, sizeof(group), category, + sizeof(category)); if (!ast_strlen_zero(group)) { count = ast_app_group_match_get_count(group, category); snprintf(buf, len, "%d", count); } - return buf; + return 0; } static struct ast_custom_function group_match_count_function = { .name = "GROUP_MATCH_COUNT", .syntax = "GROUP_MATCH_COUNT(groupmatch[@category])", - .synopsis = "Counts the number of channels in the groups matching the specified pattern", - .desc = "Calculates the group count for all groups that match the specified pattern.\n" - "Uses standard regular expression matching (see regex(7)).\n", + .synopsis = + "Counts the number of channels in the groups matching the specified pattern", + .desc = + "Calculates the group count for all groups that match the specified pattern.\n" + "Uses standard regular expression matching (see regex(7)).\n", .read = group_match_count_function_read, .write = NULL, }; -static char *group_function_read(struct ast_channel *chan, char *cmd, char *data, char *buf, size_t len) +static int group_function_read(struct ast_channel *chan, char *cmd, + char *data, char *buf, size_t len) { char varname[256]; const char *group; if (!ast_strlen_zero(data)) { - snprintf(varname, sizeof(varname), "%s_%s", GROUP_CATEGORY_PREFIX, data); + snprintf(varname, sizeof(varname), "%s_%s", GROUP_CATEGORY_PREFIX, + data); } else { ast_copy_string(varname, GROUP_CATEGORY_PREFIX, sizeof(varname)); } @@ -108,10 +119,11 @@ static char *group_function_read(struct ast_channel *chan, char *cmd, char *data if (group) ast_copy_string(buf, group, len); - return buf; + return 0; } -static void group_function_write(struct ast_channel *chan, char *cmd, char *data, const char *value) +static int group_function_write(struct ast_channel *chan, char *cmd, + char *data, const char *value) { char grpcat[256]; @@ -121,8 +133,11 @@ static void group_function_write(struct ast_channel *chan, char *cmd, char *data ast_copy_string(grpcat, value, sizeof(grpcat)); } - if (ast_app_group_set_channel(chan, grpcat)) - ast_log(LOG_WARNING, "Setting a group requires an argument (group name)\n"); + if (ast_app_group_set_channel(chan, grpcat)) + ast_log(LOG_WARNING, + "Setting a group requires an argument (group name)\n"); + + return 0; } static struct ast_custom_function group_function = { @@ -134,33 +149,41 @@ static struct ast_custom_function group_function = { .write = group_function_write, }; -static char *group_list_function_read(struct ast_channel *chan, char *cmd, char *data, char *buf, size_t len) +static int group_list_function_read(struct ast_channel *chan, char *cmd, + char *data, char *buf, size_t len) { struct ast_var_t *current; struct varshead *headp; char tmp1[1024] = ""; char tmp2[1024] = ""; - headp=&chan->varshead; - AST_LIST_TRAVERSE(headp,current,entries) { + headp = &chan->varshead; + AST_LIST_TRAVERSE(headp, current, entries) { if (!strncmp(ast_var_name(current), GROUP_CATEGORY_PREFIX "_", strlen(GROUP_CATEGORY_PREFIX) + 1)) { if (!ast_strlen_zero(tmp1)) { ast_copy_string(tmp2, tmp1, sizeof(tmp2)); - snprintf(tmp1, sizeof(tmp1), "%s %s@%s", tmp2, ast_var_value(current), (ast_var_name(current) + strlen(GROUP_CATEGORY_PREFIX) + 1)); + snprintf(tmp1, sizeof(tmp1), "%s %s@%s", tmp2, + ast_var_value(current), + (ast_var_name(current) + + strlen(GROUP_CATEGORY_PREFIX) + 1)); } else { - snprintf(tmp1, sizeof(tmp1), "%s@%s", ast_var_value(current), (ast_var_name(current) + strlen(GROUP_CATEGORY_PREFIX) + 1)); + snprintf(tmp1, sizeof(tmp1), "%s@%s", ast_var_value(current), + (ast_var_name(current) + + strlen(GROUP_CATEGORY_PREFIX) + 1)); } } else if (!strcmp(ast_var_name(current), GROUP_CATEGORY_PREFIX)) { if (!ast_strlen_zero(tmp1)) { ast_copy_string(tmp2, tmp1, sizeof(tmp2)); - snprintf(tmp1, sizeof(tmp1), "%s %s", tmp2, ast_var_value(current)); + snprintf(tmp1, sizeof(tmp1), "%s %s", tmp2, + ast_var_value(current)); } else { snprintf(tmp1, sizeof(tmp1), "%s", ast_var_value(current)); } } } ast_copy_string(buf, tmp1, len); - return buf; + + return 0; } static struct ast_custom_function group_list_function = { @@ -212,11 +235,3 @@ char *key() { return ASTERISK_GPL_KEY; } - -/* -Local Variables: -mode: C -c-file-style: "linux" -indent-tabs-mode: nil -End: -*/ |