diff options
author | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-23 18:07:12 +0000 |
---|---|---|
committer | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-23 18:07:12 +0000 |
commit | 4df94f37691d77b54f621299fd72b0720a86dabf (patch) | |
tree | d809b89ec52a6359275cbeda8a93a641590cd127 /manager.c | |
parent | 4b72b51da16dfdc720942ffcf8942159607e3a7e (diff) |
code clean up and macro implementation from
bug 6247
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@8505 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'manager.c')
-rw-r--r-- | manager.c | 20 |
1 files changed, 12 insertions, 8 deletions
@@ -320,23 +320,27 @@ struct ast_variable *astman_get_variables(struct message *m) int varlen, x, y; struct ast_variable *head = NULL, *cur; char *var, *val; - unsigned int var_count; - char *vars[32]; - + + char *parse; + AST_DECLARE_APP_ARGS(args, + AST_APP_ARG(vars)[32]; + ); + varlen = strlen("Variable: "); for (x = 0; x < m->hdrcount; x++) { if (strncasecmp("Variable: ", m->headers[x], varlen)) continue; - if (!(var = ast_strdupa(m->headers[x] + varlen))) + if (!(parse = ast_strdupa(m->headers[x] + varlen))) return head; - if ((var_count = ast_app_separate_args(var, '|', vars, sizeof(vars) / sizeof(vars[0])))) { - for (y = 0; y < var_count; y++) { - if (!vars[y]) + AST_STANDARD_APP_ARGS(args, parse); + if (args.argc) { + for (y = 0; y < args.argc; y++) { + if (!args.vars[y]) continue; - var = val = ast_strdupa(vars[y]); + var = val = ast_strdupa(args.vars[y]); strsep(&val, "="); if (!val || ast_strlen_zero(var)) continue; |