mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-22 20:56:39 +00:00
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: https://origsvn.digium.com/svn/asterisk/trunk@89268 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1242,7 +1242,8 @@ static struct call_queue *find_queue_by_name_rt(const char *queuename, struct as
|
||||
struct member *m;
|
||||
struct ao2_iterator mem_iter;
|
||||
char *interface = NULL;
|
||||
char *tmp, *tmp_name;
|
||||
const char *tmp_name;
|
||||
char *tmp;
|
||||
char tmpbuf[64]; /* Must be longer than the longest queue param name. */
|
||||
|
||||
/* Static queues override realtime. */
|
||||
@@ -1300,7 +1301,7 @@ static struct call_queue *find_queue_by_name_rt(const char *queuename, struct as
|
||||
if ((tmp = strchr(v->name, '_'))) {
|
||||
ast_copy_string(tmpbuf, v->name, sizeof(tmpbuf));
|
||||
tmp_name = tmpbuf;
|
||||
tmp = tmp_name;
|
||||
tmp = tmpbuf;
|
||||
while ((tmp = strchr(tmp, '_')))
|
||||
*tmp++ = '-';
|
||||
} else
|
||||
@@ -2664,7 +2665,7 @@ static void send_agent_complete(const struct queue_ent *qe, const char *queuenam
|
||||
const struct ast_channel *peer, const struct member *member, time_t callstart,
|
||||
char *vars, size_t vars_len, enum agent_complete_reason rsn)
|
||||
{
|
||||
const char *reason;
|
||||
const char *reason = NULL; /* silence dumb compilers */
|
||||
|
||||
if (!qe->parent->eventwhencalled)
|
||||
return;
|
||||
|
Reference in New Issue
Block a user