diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-14 15:13:22 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-14 15:13:22 +0000 |
commit | 22206839a45a4e38c78c92a9e5cba4ae00d8dd0f (patch) | |
tree | 4d13b85101ee91390cedfbdfd9efba5a436b7aea /channels | |
parent | 4373e923a8f07011650708d9a2fee841a3825577 (diff) |
One more typo in config.c; and missed conversions due to the constifying of ast_variable_new parameters
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89270 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_phone.c | 4 | ||||
-rw-r--r-- | channels/chan_zap.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/channels/chan_phone.c b/channels/chan_phone.c index 17204fda5..d657920c3 100644 --- a/channels/chan_phone.c +++ b/channels/chan_phone.c @@ -1155,7 +1155,7 @@ static int restart_monitor() return 0; } -static struct phone_pvt *mkif(char *iface, int mode, int txgain, int rxgain) +static struct phone_pvt *mkif(const char *iface, int mode, int txgain, int rxgain) { /* Make a phone_pvt structure for this interface */ struct phone_pvt *tmp; @@ -1258,7 +1258,7 @@ static struct ast_channel *phone_request(const char *type, int format, void *dat } /* parse gain value from config file */ -static int parse_gain_value(char *gain_type, char *value) +static int parse_gain_value(const char *gain_type, const char *value) { float gain; diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 6c9723e65..2ea37472c 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -12246,7 +12246,7 @@ static int build_channels(struct zt_chan_conf conf, int iscrv, const char *value static int process_zap(struct zt_chan_conf *confp, struct ast_variable *v, int reload, int skipchannels) { struct zt_pvt *tmp; - char *ringc; /* temporary string for parsing the dring number. */ + const char *ringc; /* temporary string for parsing the dring number. */ int y; int found_pseudo = 0; char zapchan[MAX_CHANLIST_LEN] = {}; @@ -12785,9 +12785,9 @@ static int process_zap(struct zt_chan_conf *confp, struct ast_variable *v, int r } } else if (!strcasecmp(v->name, "pritimer")) { #ifdef PRI_GETSET_TIMERS - char *timerc, *c; + char tmp[20], *timerc, *c = tmp; int timer, timeridx; - c = v->value; + ast_copy_string(tmp, v->value, sizeof(tmp)); timerc = strsep(&c, ","); if (timerc) { timer = atoi(c); |