diff options
| author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-14 13:18:40 +0000 |
|---|---|---|
| committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-14 13:18:40 +0000 |
| commit | ea0d4674a604b98a32c5f5b42f1878d3d75af9e0 (patch) | |
| tree | 01f0ca16e50b44357fb29bdb18793405a071da0f /pbx | |
| parent | 2e70fd87205ec4f9c775075b807c65e3703145e3 (diff) | |
make the 'name' and 'value' fields in ast_variable const char *
This prevents modifying the strings in the stored variables,
and catched a few instances where this was actually done.
Given the differences between trunk and 1.4 (and the fact that this
is effectively an API change) it is better to fix 1.4 independently.
These are
chan_sip.c::sip_register()
chan_skinny.c:: near line 2847
config.c:: near line 1774
logger.c::make_components()
res_adsi.c:: near line 1049
I may have missed some instances for modules that do not build here.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89268 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx')
| -rw-r--r-- | pbx/dundi-parser.c | 4 | ||||
| -rw-r--r-- | pbx/dundi-parser.h | 4 | ||||
| -rw-r--r-- | pbx/pbx_dundi.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pbx/dundi-parser.c b/pbx/dundi-parser.c index 42d79dc29..e618264a0 100644 --- a/pbx/dundi-parser.c +++ b/pbx/dundi-parser.c @@ -88,7 +88,7 @@ char *dundi_eid_to_str_short(char *s, int maxlen, dundi_eid *eid) return os; } -int dundi_str_to_eid(dundi_eid *eid, char *s) +int dundi_str_to_eid(dundi_eid *eid, const char *s) { unsigned int eid_int[6]; int x; @@ -100,7 +100,7 @@ int dundi_str_to_eid(dundi_eid *eid, char *s) return 0; } -int dundi_str_short_to_eid(dundi_eid *eid, char *s) +int dundi_str_short_to_eid(dundi_eid *eid, const char *s) { unsigned int eid_int[6]; int x; diff --git a/pbx/dundi-parser.h b/pbx/dundi-parser.h index 62bbf4384..8ff772347 100644 --- a/pbx/dundi-parser.h +++ b/pbx/dundi-parser.h @@ -79,8 +79,8 @@ extern int dundi_ie_append(struct dundi_ie_data *ied, unsigned char ie); extern int dundi_parse_ies(struct dundi_ies *ies, unsigned char *data, int datalen); extern char *dundi_eid_to_str(char *s, int maxlen, dundi_eid *eid); extern char *dundi_eid_to_str_short(char *s, int maxlen, dundi_eid *eid); -extern int dundi_str_to_eid(dundi_eid *eid, char *s); -extern int dundi_str_short_to_eid(dundi_eid *eid, char *s); +extern int dundi_str_to_eid(dundi_eid *eid, const char *s); +extern int dundi_str_short_to_eid(dundi_eid *eid, const char *s); extern int dundi_eid_zero(dundi_eid *eid); extern int dundi_eid_cmp(dundi_eid *eid1, dundi_eid *eid2); extern char *dundi_flags2str(char *s, int maxlen, int flags); diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index 05748b397..611483a37 100644 --- a/pbx/pbx_dundi.c +++ b/pbx/pbx_dundi.c @@ -4219,7 +4219,7 @@ static void prune_mappings(void) AST_LIST_UNLOCK(&peers); } -static void append_permission(struct permissionlist *permlist, char *s, int allow) +static void append_permission(struct permissionlist *permlist, const char *s, int allow) { struct permission *perm; @@ -4234,7 +4234,7 @@ static void append_permission(struct permissionlist *permlist, char *s, int allo #define MAX_OPTS 128 -static void build_mapping(char *name, char *value) +static void build_mapping(const char *name, const char *value) { char *t, *fields[MAX_OPTS]; struct dundi_mapping *map; |