Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Constify the result of a config retrieval function, to avoid mutilation (issue 7983).

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43364 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
Tilghman Lesher 19 years ago
parent cc99b22469
commit 70af28270d
21 changed files with 141 additions and 126 deletions
Show Stats Download Patch File Download Diff File

12
apps/app_directory.c
Unescape View File

@ -183,7 +183,7 @@ static void retrieve_file(char *dir)
} }
#endif #endif
static char *convert(char *lastname) static char *convert(const char *lastname)
{ {
char *tmp; char *tmp;
int lcount = 0; int lcount = 0;
@ -342,8 +342,8 @@ static struct ast_config *realtime_directory(char *context)
struct ast_category *cat; struct ast_category *cat;
struct ast_variable *var; struct ast_variable *var;
char *mailbox; char *mailbox;
char *fullname; const char *fullname;
char *hidefromdir; const char *hidefromdir;
char tmp[100]; char tmp[100];
/* Load flat file config. */ /* Load flat file config. */
@ -402,7 +402,8 @@ static int do_directory(struct ast_channel *chan, struct ast_config *cfg, struct
int res; int res;
int found=0; int found=0;
int lastuserchoice = 0; int lastuserchoice = 0;
char *start, *pos, *conv,*stringp=NULL; char *start, *conv, *stringp = NULL;
const char *pos;
if (ast_strlen_zero(context)) { if (ast_strlen_zero(context)) {
ast_log(LOG_WARNING, ast_log(LOG_WARNING,
@ -570,7 +571,8 @@ static int directory_exec(struct ast_channel *chan, void *data)
int last = 1; int last = 1;
int readext = 0; int readext = 0;
int fromappvm = 0; int fromappvm = 0;
char *dirintro, *parse; const char *dirintro;
char *parse;
AST_DECLARE_APP_ARGS(args, AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(vmcontext); AST_APP_ARG(vmcontext);
AST_APP_ARG(dialcontext); AST_APP_ARG(dialcontext);

8
apps/app_festival.c
Unescape View File

@ -280,10 +280,10 @@ static int festival_exec(struct ast_channel *chan, void *vdata)
struct ast_hostent ahp; struct ast_hostent ahp;
int fd; int fd;
FILE *fs; FILE *fs;
char *host; const char *host;
char *cachedir; const char *cachedir;
char *temp; const char *temp;
char *festivalcommand; const char *festivalcommand;
int port=1314; int port=1314;
int n; int n;
char ack[4]; char ack[4];

2
apps/app_meetme.c
Unescape View File

@ -2948,7 +2948,7 @@ static int slastate(const char *data)
static void load_config_meetme(void) static void load_config_meetme(void)
{ {
struct ast_config *cfg; struct ast_config *cfg;
char *val; const char *val;
audio_buffers = DEFAULT_AUDIO_BUFFERS; audio_buffers = DEFAULT_AUDIO_BUFFERS;

2
apps/app_privacy.c
Unescape View File

@ -82,7 +82,7 @@ static int privacy_exec (struct ast_channel *chan, void *data)
int maxretries = 3; int maxretries = 3;
int minlength = 10; int minlength = 10;
int x = 0; int x = 0;
char *s; const char *s;
char phone[30]; char phone[30];
struct ast_module_user *u; struct ast_module_user *u;
struct ast_config *cfg = NULL; struct ast_config *cfg = NULL;

6
apps/app_queue.c
Unescape View File

@ -596,7 +596,7 @@ static int statechange_queue(const char *dev, int state, void *ign)
return 0; return 0;
} }
static struct member *create_queue_member(char *interface, char *membername, int penalty, int paused) static struct member *create_queue_member(char *interface, const char *membername, int penalty, int paused)
{ {
struct member *cur; struct member *cur;
@ -912,7 +912,7 @@ static void queue_set_param(struct call_queue *q, const char *param, const char
} }
} }
static void rt_handle_member_record(struct call_queue *q, char *interface, char *membername, const char *penalty_str) static void rt_handle_member_record(struct call_queue *q, char *interface, const char *membername, const char *penalty_str)
{ {
struct member *m, *prev_m; struct member *m, *prev_m;
int penalty = 0; int penalty = 0;
@ -3691,7 +3691,7 @@ static int reload_queues(void)
struct ast_variable *var; struct ast_variable *var;
struct member *prev, *cur, *newm; struct member *prev, *cur, *newm;
int new; int new;
char *general_val = NULL; const char *general_val = NULL;
char parse[80]; char parse[80];
char *interface; char *interface;
char *membername; char *membername;

77
apps/app_rpt.c
Unescape View File

@ -394,17 +394,17 @@ static struct rpt
struct { struct {
char *ourcontext; const char *ourcontext;
char *ourcallerid; const char *ourcallerid;
char *acctcode; const char *acctcode;
char *ident; const char *ident;
char *tonezone; char *tonezone;
char simple; char simple;
char *functions; const char *functions;
char *link_functions; const char *link_functions;
char *phone_functions; const char *phone_functions;
char *dphone_functions; const char *dphone_functions;
char *nodes; const char *nodes;
int hangtime; int hangtime;
int totime; int totime;
int idtime; int idtime;
@ -414,9 +414,9 @@ static struct rpt
int politeid; int politeid;
char *tailmessages[500]; char *tailmessages[500];
int tailmessagemax; int tailmessagemax;
char *memory; const char *memory;
char *macro; const char *macro;
char *startupmacro; const char *startupmacro;
int iobase; int iobase;
char funcchar; char funcchar;
char endchar; char endchar;
@ -900,7 +900,7 @@ int i;
static int myatoi(char *str) static int myatoi(const char *str)
{ {
int ret; int ret;
@ -941,7 +941,7 @@ struct rptfilter *f;
static int retrieve_astcfgint(struct rpt *myrpt,char *category, char *name, int min, int max, int defl) static int retrieve_astcfgint(struct rpt *myrpt,char *category, char *name, int min, int max, int defl)
{ {
char *var; const char *var;
int ret; int ret;
var = ast_variable_retrieve(myrpt->cfg, category, name); var = ast_variable_retrieve(myrpt->cfg, category, name);
@ -960,7 +960,8 @@ static int retrieve_astcfgint(struct rpt *myrpt,char *category, char *name, int
static void load_rpt_vars(int n,int init) static void load_rpt_vars(int n,int init)
{ {
char *this,*val; char *this;
const char *val;
int j,longestnode; int j,longestnode;
struct ast_variable *vp; struct ast_variable *vp;
struct ast_config *cfg; struct ast_config *cfg;
@ -1021,11 +1022,11 @@ char *strs[100];
rpt_vars[n].p.idtime = retrieve_astcfgint(&rpt_vars[n],this, "idtime", 60000, 2400000, IDTIME); /* Enforce a min max */ rpt_vars[n].p.idtime = retrieve_astcfgint(&rpt_vars[n],this, "idtime", 60000, 2400000, IDTIME); /* Enforce a min max */
rpt_vars[n].p.politeid = retrieve_astcfgint(&rpt_vars[n],this, "politeid", 30000, 300000, POLITEID); /* Enforce a min max */ rpt_vars[n].p.politeid = retrieve_astcfgint(&rpt_vars[n],this, "politeid", 30000, 300000, POLITEID); /* Enforce a min max */
val = ast_variable_retrieve(cfg,this,"tonezone"); val = ast_variable_retrieve(cfg,this,"tonezone");
if (val) rpt_vars[n].p.tonezone = val; if (val) rpt_vars[n].p.tonezone = ast_strdupa(val);
rpt_vars[n].p.tailmessages[0] = 0; rpt_vars[n].p.tailmessages[0] = 0;
rpt_vars[n].p.tailmessagemax = 0; rpt_vars[n].p.tailmessagemax = 0;
val = ast_variable_retrieve(cfg,this,"tailmessagelist"); val = ast_variable_retrieve(cfg,this,"tailmessagelist");
if (val) rpt_vars[n].p.tailmessagemax = finddelim(val, rpt_vars[n].p.tailmessages, 500); if (val) rpt_vars[n].p.tailmessagemax = finddelim(ast_strdupa(val), rpt_vars[n].p.tailmessages, 500);
val = ast_variable_retrieve(cfg,this,"memory"); val = ast_variable_retrieve(cfg,this,"memory");
if (!val) val = MEMORY; if (!val) val = MEMORY;
rpt_vars[n].p.memory = val; rpt_vars[n].p.memory = val;
@ -1069,7 +1070,7 @@ char *strs[100];
#ifdef __RPT_NOTCH #ifdef __RPT_NOTCH
val = ast_variable_retrieve(cfg,this,"rxnotch"); val = ast_variable_retrieve(cfg,this,"rxnotch");
if (val) { if (val) {
i = finddelim(val,strs,MAXFILTERS * 2); i = finddelim(ast_strdupa(val),strs,MAXFILTERS * 2);
i &= ~1; /* force an even number, rounded down */ i &= ~1; /* force an even number, rounded down */
if (i >= 2) for(j = 0; j < i; j += 2) if (i >= 2) for(j = 0; j < i; j += 2)
{ {
@ -1523,7 +1524,7 @@ static int play_silence(struct ast_channel *chan, int duration)
} }
static int send_morse(struct ast_channel *chan, char *string, int speed, int freq, int amplitude) static int send_morse(struct ast_channel *chan, const char *string, int speed, int freq, int amplitude)
{ {
static struct morse_bits mbits[] = { static struct morse_bits mbits[] = {
@ -1685,7 +1686,7 @@ static struct morse_bits mbits[] = {
return res; return res;
} }
static int send_tone_telemetry(struct ast_channel *chan, char *tonestring) static int send_tone_telemetry(struct ast_channel *chan, const char *tonestring)
{ {
char *stringp; char *stringp;
char *tonesubset; char *tonesubset;
@ -1737,7 +1738,7 @@ static int send_tone_telemetry(struct ast_channel *chan, char *tonestring)
} }
static int sayfile(struct ast_channel *mychannel,char *fname) static int sayfile(struct ast_channel *mychannel, const char *fname)
{ {
int res; int res;
@ -1776,7 +1777,7 @@ static int saynum(struct ast_channel *mychannel, int num)
} }
static int telem_any(struct rpt *myrpt,struct ast_channel *chan, char *entry) static int telem_any(struct rpt *myrpt,struct ast_channel *chan, const char *entry)
{ {
int res; int res;
char c; char c;
@ -1837,8 +1838,8 @@ static int telem_lookup(struct rpt *myrpt,struct ast_channel *chan, char *node,
int res; int res;
int i; int i;
char *entry; const char *entry;
char *telemetry; const char *telemetry;
char *telemetry_save; char *telemetry_save;
res = 0; res = 0;
@ -1882,7 +1883,7 @@ static int telem_lookup(struct rpt *myrpt,struct ast_channel *chan, char *node,
static int get_wait_interval(struct rpt *myrpt, int type) static int get_wait_interval(struct rpt *myrpt, int type)
{ {
int interval; int interval;
char *wait_times; const char *wait_times;
char *wait_times_save; char *wait_times_save;
wait_times_save = NULL; wait_times_save = NULL;
@ -1960,7 +1961,8 @@ struct rpt_tele *tlist;
struct rpt *myrpt; struct rpt *myrpt;
struct rpt_link *l,*m,linkbase; struct rpt_link *l,*m,linkbase;
struct ast_channel *mychannel; struct ast_channel *mychannel;
char *p,*ct,*ct_copy,*ident, *nodename; const char *p, *ct;
char *ct_copy, *ident, *nodename;
time_t t; time_t t;
struct tm localtm; struct tm localtm;
@ -2922,7 +2924,8 @@ struct rpt_link *l;
static int function_ilink(struct rpt *myrpt, char *param, char *digits, int command_source, struct rpt_link *mylink) static int function_ilink(struct rpt *myrpt, char *param, char *digits, int command_source, struct rpt_link *mylink)
{ {
char *val, *s, *s1, *s2, *tele; const char *val;
char *s, *s1, *s2, *tele;
char tmp[300], deststr[300] = "",modechange = 0; char tmp[300], deststr[300] = "",modechange = 0;
char digitbuf[MAXNODESTR]; char digitbuf[MAXNODESTR];
struct rpt_link *l; struct rpt_link *l;
@ -3445,7 +3448,7 @@ static int function_status(struct rpt *myrpt, char *param, char *digitbuf, int c
static int function_macro(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink) static int function_macro(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink)
{ {
char *val; const char *val;
int i; int i;
struct ast_channel *mychannel; struct ast_channel *mychannel;
@ -4920,7 +4923,8 @@ static int rmt_saycharstr(struct rpt *myrpt, struct ast_channel *chan, int delay
static int function_remote(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink) static int function_remote(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink)
{ {
char *s,*s1,*s2,*val; char *s,*s1,*s2;
const char *val;
int i,j,ht,k,l,ls2,m,d,res,offset,offsave, modesave, defmode; int i,j,ht,k,l,ls2,m,d,res,offset,offsave, modesave, defmode;
char multimode = 0; char multimode = 0;
char oc; char oc;
@ -4954,7 +4958,7 @@ static int function_remote(struct rpt *myrpt, char *param, char *digitbuf, int c
sayfile(mychannel,"rpt/memory_notfound"); sayfile(mychannel,"rpt/memory_notfound");
return DC_COMPLETE; return DC_COMPLETE;
} }
strncpy(tmp,val,sizeof(tmp) - 1); ast_copy_string(tmp, val, sizeof(tmp));
s = strchr(tmp,','); s = strchr(tmp,',');
if (!s) if (!s)
return DC_ERROR; return DC_ERROR;
@ -5773,7 +5777,8 @@ int res;
static int attempt_reconnect(struct rpt *myrpt, struct rpt_link *l) static int attempt_reconnect(struct rpt *myrpt, struct rpt_link *l)
{ {
char *val, *s, *s1, *s2, *tele; const char *val;
char *s, *s1, *s2, *tele;
char tmp[300], deststr[300] = ""; char tmp[300], deststr[300] = "";
val = ast_variable_retrieve(myrpt->cfg, myrpt->p.nodes, l->name); val = ast_variable_retrieve(myrpt->cfg, myrpt->p.nodes, l->name);
@ -6018,7 +6023,8 @@ static void do_scheduler(struct rpt *myrpt)
static void *rpt(void *this) static void *rpt(void *this)
{ {
struct rpt *myrpt = (struct rpt *)this; struct rpt *myrpt = (struct rpt *)this;
char *tele,*idtalkover,c; char *tele, c;
const char *idtalkover;
int ms = MSWAIT,i,lasttx=0,val,remrx=0,identqueued,othertelemqueued,tailmessagequeued,ctqueued; int ms = MSWAIT,i,lasttx=0,val,remrx=0,identqueued,othertelemqueued,tailmessagequeued,ctqueued;
struct ast_channel *who; struct ast_channel *who;
ZT_CONFINFO ci; /* conference info */ ZT_CONFINFO ci; /* conference info */
@ -7156,7 +7162,8 @@ static void *rpt_master(void *config)
int i,n; int i,n;
pthread_attr_t attr; pthread_attr_t attr;
struct ast_config *cfg; struct ast_config *cfg;
char *this,*val; char *this;
const char *val;
/* go thru all the specified repeaters */ /* go thru all the specified repeaters */
this = NULL; this = NULL;
@ -7442,7 +7449,9 @@ static int rpt_exec(struct ast_channel *chan, void *data)
struct ast_hostent ahp; struct ast_hostent ahp;
struct hostent *hp; struct hostent *hp;
struct in_addr ia; struct in_addr ia;
char hisip[100],nodeip[100],*val, *s, *s1, *s2, *b,*b1; char hisip[100],nodeip[100];
const char *val;
char *s, *s1, *s2, *b,*b1;
/* look at callerid to see what node this comes from */ /* look at callerid to see what node this comes from */
if (!chan->cid.cid_num) /* if doesn't have caller id */ if (!chan->cid.cid_num) /* if doesn't have caller id */

91
apps/app_voicemail.c
Unescape View File

@ -3800,7 +3800,8 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st
int res = 0, cmd = 0; int res = 0, cmd = 0;
struct ast_vm_user *receiver = NULL, *vmtmp; struct ast_vm_user *receiver = NULL, *vmtmp;
AST_LIST_HEAD_NOLOCK_STATIC(extensions, ast_vm_user); AST_LIST_HEAD_NOLOCK_STATIC(extensions, ast_vm_user);
char *stringp, *s; char *stringp;
const char *s;
int saved_messages = 0, found = 0; int saved_messages = 0, found = 0;
int valid_extensions = 0; int valid_extensions = 0;
char *dir; char *dir;
@ -4097,7 +4098,7 @@ static int wait_file(struct ast_channel *chan, struct vm_state *vms, char *file)
return ast_control_streamfile(chan, file, "#", "*", "1456789", "0", "2", skipms); return ast_control_streamfile(chan, file, "#", "*", "1456789", "0", "2", skipms);
} }
static int play_message_category(struct ast_channel *chan, char *category) static int play_message_category(struct ast_channel *chan, const char *category)
{ {
int res = 0; int res = 0;
@ -4112,7 +4113,7 @@ static int play_message_category(struct ast_channel *chan, char *category)
return res; return res;
} }
static int play_message_datetime(struct ast_channel *chan, struct ast_vm_user *vmu, char *origtime, char *filename) static int play_message_datetime(struct ast_channel *chan, struct ast_vm_user *vmu, const char *origtime, const char *filename)
{ {
int res = 0; int res = 0;
struct vm_zone *the_zone = NULL; struct vm_zone *the_zone = NULL;
@ -4180,7 +4181,7 @@ static int play_message_datetime(struct ast_channel *chan, struct ast_vm_user *v
static int play_message_callerid(struct ast_channel *chan, struct vm_state *vms, char *cid, char *context, int callback) static int play_message_callerid(struct ast_channel *chan, struct vm_state *vms, char *cid, const char *context, int callback)
{ {
int res = 0; int res = 0;
int i; int i;
@ -4243,7 +4244,7 @@ static int play_message_callerid(struct ast_channel *chan, struct vm_state *vms,
return res; return res;
} }
static int play_message_duration(struct ast_channel *chan, struct vm_state *vms, char *duration, int minduration) static int play_message_duration(struct ast_channel *chan, struct vm_state *vms, const char *duration, int minduration)
{ {
int res = 0; int res = 0;
int durationm; int durationm;
@ -4412,8 +4413,8 @@ static int play_message(struct ast_channel *chan, struct ast_vm_user *vmu, struc
static int play_message(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms) static int play_message(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms)
{ {
int res = 0; int res = 0;
char filename[256],*origtime, *cid, *context, *duration; char filename[256], *cid;
char *category; const char *origtime, *context, *category, *duration;
struct ast_config *msg_cfg; struct ast_config *msg_cfg;
vms->starting = 0; vms->starting = 0;
@ -6851,44 +6852,45 @@ static int load_config(void)
struct ast_config *cfg, *ucfg; struct ast_config *cfg, *ucfg;
char *cat; char *cat;
struct ast_variable *var; struct ast_variable *var;
char *notifystr = NULL; const char *notifystr = NULL;
char *smdistr = NULL; const char *smdistr = NULL;
char *astattach; const char *astattach;
char *astsearch; const char *astsearch;
char *astsaycid; const char *astsaycid;
char *send_voicemail; const char *send_voicemail;
#ifdef IMAP_STORAGE #ifdef IMAP_STORAGE
char *imap_server; const char *imap_server;
char *imap_port; const char *imap_port;
char *imap_flags; const char *imap_flags;
char *auth_user; const char *auth_user;
char *auth_password; const char *auth_password;
char *expunge_on_hangup; const char *expunge_on_hangup;
#endif #endif
char *astcallop; const char *astcallop;
char *astreview; const char *astreview;
char *asttempgreetwarn; const char *asttempgreetwarn;
char *astskipcmd; const char *astskipcmd;
char *asthearenv; const char *asthearenv;
char *astsaydurationinfo; const char *astsaydurationinfo;
char *astsaydurationminfo; const char *astsaydurationminfo;
char *silencestr; const char *silencestr;
char *maxmsgstr; const char *maxmsgstr;
char *astdirfwd; const char *astdirfwd;
char *thresholdstr; const char *thresholdstr;
char *fmt; const char *fmt;
char *astemail; const char *astemail;
char *ucontext; const char *ucontext;
char *astmailcmd = SENDMAIL; const char *astmailcmd = SENDMAIL;
char *astforcename; const char *astforcename;
char *astforcegreet; const char *astforcegreet;
char *s,*q,*stringp; const char *s;
char *dialoutcxt = NULL; char *q,*stringp;
char *callbackcxt = NULL; const char *dialoutcxt = NULL;
char *exitcxt = NULL; const char *callbackcxt = NULL;
char *extpc; const char *exitcxt = NULL;
char *emaildateformatstr; const char *extpc;
char *volgainstr; const char *emaildateformatstr;
const char *volgainstr;
int x; int x;
int tmpadsi[4]; int tmpadsi[4];
@ -7474,7 +7476,8 @@ static int advanced_options(struct ast_channel *chan, struct ast_vm_user *vmu, s
#endif #endif
char filename[256]; char filename[256];
struct ast_config *msg_cfg; struct ast_config *msg_cfg;
char *origtime, *cid, *context, *name, *num; const char *origtime, *context;
char *cid, *name, *num;
int retries = 0; int retries = 0;
vms->starting = 0; vms->starting = 0;

2
cdr/cdr_csv.c
Unescape View File

@ -98,7 +98,7 @@ static int load_config(void)
{ {
struct ast_config *cfg; struct ast_config *cfg;
struct ast_variable *var; struct ast_variable *var;
char *tmp; const char *tmp;
usegmtime = 0; usegmtime = 0;
loguniqueid = 0; loguniqueid = 0;

2
cdr/cdr_odbc.c
Unescape View File

@ -246,7 +246,7 @@ static int odbc_load_module(void)
int res = 0; int res = 0;
struct ast_config *cfg; struct ast_config *cfg;
struct ast_variable *var; struct ast_variable *var;
char *tmp; const char *tmp;
ast_mutex_lock(&odbc_lock); ast_mutex_lock(&odbc_lock);

12
channels/chan_iax2.c
Unescape View File

@ -8796,8 +8796,8 @@ static int set_config(char *config_file, int reload)
int capability=iax2_capability; int capability=iax2_capability;
struct ast_variable *v; struct ast_variable *v;
char *cat; char *cat;
char *utype; const char *utype;
char *tosval; const char *tosval;
int format; int format;
int portno = IAX_DEFAULT_PORTNO; int portno = IAX_DEFAULT_PORTNO;
int x; int x;
@ -9051,7 +9051,7 @@ static int set_config(char *config_file, int reload)
struct ast_variable *gen; struct ast_variable *gen;
int genhasiax; int genhasiax;
int genregisteriax; int genregisteriax;
char *hasiax, *registeriax; const char *hasiax, *registeriax;
genhasiax = ast_true(ast_variable_retrieve(ucfg, "general", "hasiax")); genhasiax = ast_true(ast_variable_retrieve(ucfg, "general", "hasiax"));
genregisteriax = ast_true(ast_variable_retrieve(ucfg, "general", "registeriax")); genregisteriax = ast_true(ast_variable_retrieve(ucfg, "general", "registeriax"));
@ -9080,9 +9080,9 @@ static int set_config(char *config_file, int reload)
} }
if (ast_true(registeriax) || (!registeriax && genregisteriax)) { if (ast_true(registeriax) || (!registeriax && genregisteriax)) {
char tmp[256]; char tmp[256];
char *host = ast_variable_retrieve(ucfg, cat, "host"); const char *host = ast_variable_retrieve(ucfg, cat, "host");
char *username = ast_variable_retrieve(ucfg, cat, "username"); const char *username = ast_variable_retrieve(ucfg, cat, "username");
char *secret = ast_variable_retrieve(ucfg, cat, "secret"); const char *secret = ast_variable_retrieve(ucfg, cat, "secret");
if (!host) if (!host)
host = ast_variable_retrieve(ucfg, "general", "host"); host = ast_variable_retrieve(ucfg, "general", "host");
if (!username) if (!username)

10
channels/chan_sip.c
Unescape View File

@ -15975,7 +15975,7 @@ static int reload_config(enum channelreloadreason reason)
if (ucfg) { if (ucfg) {
struct ast_variable *gen; struct ast_variable *gen;
int genhassip, genregistersip; int genhassip, genregistersip;
char *hassip, *registersip; const char *hassip, *registersip;
genhassip = ast_true(ast_variable_retrieve(ucfg, "general", "hassip")); genhassip = ast_true(ast_variable_retrieve(ucfg, "general", "hassip"));
genregistersip = ast_true(ast_variable_retrieve(ucfg, "general", "registersip")); genregistersip = ast_true(ast_variable_retrieve(ucfg, "general", "registersip"));
@ -15995,10 +15995,10 @@ static int reload_config(enum channelreloadreason reason)
} }
if (ast_true(registersip) || (!registersip && genregistersip)) { if (ast_true(registersip) || (!registersip && genregistersip)) {
char tmp[256]; char tmp[256];
char *host = ast_variable_retrieve(ucfg, cat, "host"); const char *host = ast_variable_retrieve(ucfg, cat, "host");
char *username = ast_variable_retrieve(ucfg, cat, "username"); const char *username = ast_variable_retrieve(ucfg, cat, "username");
char *secret = ast_variable_retrieve(ucfg, cat, "secret"); const char *secret = ast_variable_retrieve(ucfg, cat, "secret");
char *contact = ast_variable_retrieve(ucfg, cat, "contact"); const char *contact = ast_variable_retrieve(ucfg, cat, "contact");
if (!host) if (!host)
host = ast_variable_retrieve(ucfg, "general", "host"); host = ast_variable_retrieve(ucfg, "general", "host");
if (!username) if (!username)

6
channels/chan_zap.c
Unescape View File

@ -10322,7 +10322,7 @@ static int unload_module(void)
return __unload_module(); return __unload_module();
} }
static int build_channels(int iscrv, char *value, int reload, int lineno, int *found_pseudo) static int build_channels(int iscrv, const char *value, int reload, int lineno, int *found_pseudo)
{ {
char *c, *chan; char *c, *chan;
int x, y, start, finish; int x, y, start, finish;
@ -10337,7 +10337,7 @@ static int build_channels(int iscrv, char *value, int reload, int lineno, int *f
return -1; return -1;
} }
c = value; c = ast_strdupa(value);
#ifdef HAVE_PRI #ifdef HAVE_PRI
pri = NULL; pri = NULL;
@ -11162,7 +11162,7 @@ static int setup_zap(int reload)
cfg = ast_config_load("users.conf"); cfg = ast_config_load("users.conf");
if (cfg) { if (cfg) {
char *cat; char *cat;
char *chans; const char *chans;
process_zap(ast_variable_browse(cfg, "general"), 1, 1); process_zap(ast_variable_browse(cfg, "general"), 1, 1);
for (cat = ast_category_browse(cfg, NULL); cat ; cat = ast_category_browse(cfg, cat)) { for (cat = ast_category_browse(cfg, NULL); cat ; cat = ast_category_browse(cfg, cat)) {
if (!strcasecmp(cat, "general")) if (!strcasecmp(cat, "general"))

4
channels/iax2-provision.c
Unescape View File

@ -259,7 +259,7 @@ int iax_provision_version(unsigned int *version, const char *template, int force
return ret; return ret;
} }
static int iax_template_parse(struct iax_template *cur, struct ast_config *cfg, char *s, char *def) static int iax_template_parse(struct iax_template *cur, struct ast_config *cfg, const char *s, const char *def)
{ {
struct ast_variable *v; struct ast_variable *v;
int foundportno = 0; int foundportno = 0;
@ -269,7 +269,7 @@ static int iax_template_parse(struct iax_template *cur, struct ast_config *cfg,
struct hostent *hp; struct hostent *hp;
struct ast_hostent h; struct ast_hostent h;
struct iax_template *src, tmp; struct iax_template *src, tmp;
char *t; const char *t;
if (def) { if (def) {
t = ast_variable_retrieve(cfg, s ,"template"); t = ast_variable_retrieve(cfg, s ,"template");
src = NULL; src = NULL;

2
funcs/func_odbc.c
Unescape View File

@ -350,7 +350,7 @@ static struct ast_custom_function escape_function = {
static int init_acf_query(struct ast_config *cfg, char *catg, struct acf_odbc_query **query) static int init_acf_query(struct ast_config *cfg, char *catg, struct acf_odbc_query **query)
{ {
char *tmp; const char *tmp;
if (!cfg || !catg) { if (!cfg || !catg) {
return -1; return -1;

4
include/asterisk/config.h
Unescape View File

@ -100,7 +100,7 @@ struct ast_variable *ast_variable_browse(const struct ast_config *config, const
* *
* Returns the variable value on success, or NULL if unable to find it. * Returns the variable value on success, or NULL if unable to find it.
*/ */
char *ast_variable_retrieve(const struct ast_config *config, const char *category, const char *variable); const char *ast_variable_retrieve(const struct ast_config *config, const char *category, const char *variable);
/*! \brief Retrieve a category if it exists /*! \brief Retrieve a category if it exists
* \param config which config to use * \param config which config to use
@ -172,7 +172,7 @@ int read_config_maps(void);
struct ast_config *ast_config_new(void); struct ast_config *ast_config_new(void);
struct ast_category *ast_config_get_current_category(const struct ast_config *cfg); struct ast_category *ast_config_get_current_category(const struct ast_config *cfg);
void ast_config_set_current_category(struct ast_config *cfg, const struct ast_category *cat); void ast_config_set_current_category(struct ast_config *cfg, const struct ast_category *cat);
char *ast_config_option(struct ast_config *cfg, const char *cat, const char *var); const char *ast_config_option(struct ast_config *cfg, const char *cat, const char *var);
struct ast_category *ast_category_new(const char *name); struct ast_category *ast_category_new(const char *name);
void ast_category_append(struct ast_config *config, struct ast_category *cat); void ast_category_append(struct ast_config *config, struct ast_category *cat);

6
main/config.c
Unescape View File

@ -147,9 +147,9 @@ struct ast_variable *ast_variable_browse(const struct ast_config *config, const
return (cat) ? cat->root : NULL; return (cat) ? cat->root : NULL;
} }
char *ast_config_option(struct ast_config *cfg, const char *cat, const char *var) const char *ast_config_option(struct ast_config *cfg, const char *cat, const char *var)
{ {
char *tmp; const char *tmp;
tmp = ast_variable_retrieve(cfg, cat, var); tmp = ast_variable_retrieve(cfg, cat, var);
if (!tmp) if (!tmp)
tmp = ast_variable_retrieve(cfg, "general", var); tmp = ast_variable_retrieve(cfg, "general", var);
@ -157,7 +157,7 @@ char *ast_config_option(struct ast_config *cfg, const char *cat, const char *var
} }
char *ast_variable_retrieve(const struct ast_config *config, const char *category, const char *variable) const char *ast_variable_retrieve(const struct ast_config *config, const char *category, const char *variable)
{ {
struct ast_variable *v; struct ast_variable *v;

2
main/logger.c
Unescape View File

@ -286,7 +286,7 @@ static void init_logger_chain(void)
struct logchannel *chan; struct logchannel *chan;
struct ast_config *cfg; struct ast_config *cfg;
struct ast_variable *var; struct ast_variable *var;
char *s; const char *s;
/* delete our list of log channels */ /* delete our list of log channels */
AST_LIST_LOCK(&logchannels); AST_LIST_LOCK(&logchannels);

9
main/manager.c
Unescape View File

@ -776,9 +776,9 @@ void astman_send_ack(struct mansession *s, struct message *m, char *msg)
ast_instring("this|that|more","this",',') == 1; ast_instring("this|that|more","this",',') == 1;
feel free to move this to app.c -anthm */ feel free to move this to app.c -anthm */
static int ast_instring(char *bigstr, char *smallstr, char delim) static int ast_instring(const char *bigstr, const char *smallstr, char delim)
{ {
char *val = bigstr, *next; const char *val = bigstr, *next;
do { do {
if ((next = strchr(val, delim))) { if ((next = strchr(val, delim))) {
@ -794,7 +794,7 @@ static int ast_instring(char *bigstr, char *smallstr, char delim)
return 0; return 0;
} }
static int get_perm(char *instr) static int get_perm(const char *instr)
{ {
int x = 0, ret = 0; int x = 0, ret = 0;
@ -2586,7 +2586,8 @@ static int webregged = 0;
int init_manager(void) int init_manager(void)
{ {
struct ast_config *cfg = NULL; struct ast_config *cfg = NULL;
char *val, *cat = NULL; const char *val;
char *cat = NULL;
int oldportno = portno; int oldportno = portno;
static struct sockaddr_in ba; static struct sockaddr_in ba;
int x = 1; int x = 1;

2
main/rtp.c
Unescape View File

@ -3452,7 +3452,7 @@ static struct ast_cli_entry cli_rtp[] = {
int ast_rtp_reload(void) int ast_rtp_reload(void)
{ {
struct ast_config *cfg; struct ast_config *cfg;
char *s; const char *s;
rtpstart = 5000; rtpstart = 5000;
rtpend = 31000; rtpend = 31000;

2
main/udptl.c
Unescape View File

@ -1183,7 +1183,7 @@ static struct ast_cli_entry cli_udptl[] = {
void ast_udptl_reload(void) void ast_udptl_reload(void)
{ {
struct ast_config *cfg; struct ast_config *cfg;
char *s; const char *s;
udptlstart = 4500; udptlstart = 4500;
udptlend = 4999; udptlend = 4999;

6
pbx/pbx_config.c
Unescape View File

@ -2171,7 +2171,7 @@ static int pbx_load_config(const char *config_file)
int lastpri = -2; int lastpri = -2;
struct ast_context *con; struct ast_context *con;
struct ast_variable *v; struct ast_variable *v;
char *cxt; const char *cxt;
cfg = ast_config_load(config_file); cfg = ast_config_load(config_file);
if (!cfg) if (!cfg)
@ -2340,8 +2340,8 @@ static void pbx_load_users(void)
{ {
struct ast_config *cfg; struct ast_config *cfg;
char *cat, *chan; char *cat, *chan;
char *zapchan; const char *zapchan;
char *hasexten; const char *hasexten;
char tmp[256]; char tmp[256];
char iface[256]; char iface[256];
char zapcopy[256]; char zapcopy[256];

Write Preview
Loading…
Cancel
Save