diff options
author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-19 23:24:27 +0000 |
---|---|---|
committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-19 23:24:27 +0000 |
commit | 77f799ff1eab72ca12a0b89f48f7b4907c44e2be (patch) | |
tree | b7dc4ff6bdbb84391b8b226995daa5bb8fbde8b9 /main/app.c | |
parent | 5bc0b2d273087883a17b7804240030a322292279 (diff) |
After some study, thought, comparing, etc. I've backed out the previous universal mod to make ast_flags a 64 bit thing. Instead, I added a 64-bit version of ast_flags (ast_flags64), and 64-bit versions of the test-flag, set-flag, etc. macros, and an app_parse_options64 routine, and I use these in app_dial alone, to eliminate the 30-option limit it had grown to meet. There is room now for 32 more options and flags. I was heavily tempted to implement some of the other ideas that were presented, but this solution does not intro any new versions of dial, doesn't have a different API, has a minimal/zero impact on code outside of dial, and doesn't seriously (I hope) affect the code structure of dial. It's the best I can think of right now. My goal was NOT to rewrite dial. I leave that to a future, coordinated effort.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@75983 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/app.c')
-rw-r--r-- | main/app.c | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/main/app.c b/main/app.c index 52536abc5..f46cb9b9a 100644 --- a/main/app.c +++ b/main/app.c @@ -1457,3 +1457,43 @@ int ast_app_parse_options(const struct ast_app_option *options, struct ast_flags return res; } +/* the following function will probably only be used in app_dial, until app_dial is reorganized to + better handle the large number of options it provides. After it is, you need to get rid of this variant + -- unless, of course, someone else digs up some use for large flag fields. */ + +int ast_app_parse_options64(const struct ast_app_option *options, struct ast_flags64 *flags, char **args, char *optstr) +{ + char *s, *arg; + int curarg, res = 0; + unsigned int argloc; + + flags->flags = 0; + + if (!optstr) + return 0; + + s = optstr; + while (*s) { + curarg = *s++ & 0x7f; /* the array (in app.h) has 128 entries */ + ast_set_flag64(flags, options[curarg].flag); + argloc = options[curarg].arg_index; + if (*s == '(') { + /* Has argument */ + arg = ++s; + if ((s = strchr(s, ')'))) { + if (argloc) + args[argloc - 1] = arg; + *s++ = '\0'; + } else { + ast_log(LOG_WARNING, "Missing closing parenthesis for argument '%c' in string '%s'\n", curarg, arg); + res = -1; + break; + } + } else if (argloc) { + args[argloc - 1] = NULL; + } + } + + return res; +} + |