diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/config.c | 6 | ||||
| -rw-r--r-- | main/logger.c | 2 | ||||
| -rw-r--r-- | main/manager.c | 9 | ||||
| -rw-r--r-- | main/rtp.c | 2 | ||||
| -rw-r--r-- | main/udptl.c | 2 |
5 files changed, 11 insertions, 10 deletions
diff --git a/main/config.c b/main/config.c index 9f7cfd4dc..b855dfab2 100644 --- a/main/config.c +++ b/main/config.c @@ -147,9 +147,9 @@ struct ast_variable *ast_variable_browse(const struct ast_config *config, const 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); if (!tmp) 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; diff --git a/main/logger.c b/main/logger.c index c9dbf4dea..12c37a83b 100644 --- a/main/logger.c +++ b/main/logger.c @@ -286,7 +286,7 @@ static void init_logger_chain(void) struct logchannel *chan; struct ast_config *cfg; struct ast_variable *var; - char *s; + const char *s; /* delete our list of log channels */ AST_LIST_LOCK(&logchannels); diff --git a/main/manager.c b/main/manager.c index 5b220dfca..543784c13 100644 --- a/main/manager.c +++ b/main/manager.c @@ -776,9 +776,9 @@ void astman_send_ack(struct mansession *s, struct message *m, char *msg) ast_instring("this|that|more","this",',') == 1; 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 { if ((next = strchr(val, delim))) { @@ -794,7 +794,7 @@ static int ast_instring(char *bigstr, char *smallstr, char delim) return 0; } -static int get_perm(char *instr) +static int get_perm(const char *instr) { int x = 0, ret = 0; @@ -2586,7 +2586,8 @@ static int webregged = 0; int init_manager(void) { struct ast_config *cfg = NULL; - char *val, *cat = NULL; + const char *val; + char *cat = NULL; int oldportno = portno; static struct sockaddr_in ba; int x = 1; diff --git a/main/rtp.c b/main/rtp.c index 0cf0aec76..748837eee 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -3452,7 +3452,7 @@ static struct ast_cli_entry cli_rtp[] = { int ast_rtp_reload(void) { struct ast_config *cfg; - char *s; + const char *s; rtpstart = 5000; rtpend = 31000; diff --git a/main/udptl.c b/main/udptl.c index d21cfe981..51d1fb97b 100644 --- a/main/udptl.c +++ b/main/udptl.c @@ -1183,7 +1183,7 @@ static struct ast_cli_entry cli_udptl[] = { void ast_udptl_reload(void) { struct ast_config *cfg; - char *s; + const char *s; udptlstart = 4500; udptlend = 4999; |