diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-11-15 15:21:04 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-11-15 15:21:04 +0000 |
| commit | e7e208009f9dc85f0fb062a6fff587124ae982e6 (patch) | |
| tree | 8c60b79410f6fecbcae05f9c0388a9904357ebb9 /channels/misdn_config.c | |
| parent | 6260590ec2e5140d3434c2b1bf3303ce5e78d9f8 (diff) | |
And file said... let trunk build again! Accomplished by some more constification, and marking a function in chan_sip as purposely unused until it is fixed up.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89290 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/misdn_config.c')
| -rw-r--r-- | channels/misdn_config.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/channels/misdn_config.c b/channels/misdn_config.c index 467e0a8af..12b299343 100644 --- a/channels/misdn_config.c +++ b/channels/misdn_config.c @@ -435,7 +435,7 @@ static int _enum_array_map (void) return 0; } -static int get_cfg_position (char *name, int type) +static int get_cfg_position (const char *name, int type) { int i; @@ -861,11 +861,12 @@ int misdn_cfg_get_next_port_spin (int port) return (p > 0) ? p : misdn_cfg_get_next_port(0); } -static int _parse (union misdn_cfg_pt *dest, char *value, enum misdn_cfg_type type, int boolint_def) +static int _parse (union misdn_cfg_pt *dest, const char *value, enum misdn_cfg_type type, int boolint_def) { int re = 0; int len, tmp; char *valtmp; + char *tmp2 = ast_strdupa(value); switch (type) { case MISDN_CTYPE_STR: @@ -905,7 +906,7 @@ static int _parse (union misdn_cfg_pt *dest, char *value, enum misdn_cfg_type ty } break; case MISDN_CTYPE_MSNLIST: - for (valtmp = strsep(&value, ","); valtmp; valtmp = strsep(&value, ",")) { + for (valtmp = strsep(&tmp2, ","); valtmp; valtmp = strsep(&tmp2, ",")) { if ((len = strlen(valtmp))) { struct msn_list *ml = ast_malloc(sizeof(*ml)); ml->msn = ast_calloc(len+1, sizeof(char)); @@ -961,10 +962,10 @@ static void _build_port_config (struct ast_variable *v, char *cat) for (; v; v = v->next) { if (!strcasecmp(v->name, "ports")) { - char *token; + char *token, *tmp = ast_strdupa(v->value); char ptpbuf[BUFFERSIZE] = ""; int start, end; - for (token = strsep(&v->value, ","); token; token = strsep(&v->value, ","), *ptpbuf = 0) { + for (token = strsep(&tmp, ","); token; token = strsep(&tmp, ","), *ptpbuf = 0) { if (!*token) continue; if (sscanf(token, "%d-%d%s", &start, &end, ptpbuf) >= 2) { |