a little more const-ification

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49727 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Kevin P. Fleming 19 years ago
parent 130eb5602f
commit d0f3b18d16

@ -176,15 +176,15 @@ const char *ast_config_option(struct ast_config *cfg, const char *cat, const cha
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);
int ast_category_delete(struct ast_config *cfg, char *category); int ast_category_delete(struct ast_config *cfg, const char *category);
void ast_category_destroy(struct ast_category *cat); void ast_category_destroy(struct ast_category *cat);
struct ast_variable *ast_category_detach_variables(struct ast_category *cat); struct ast_variable *ast_category_detach_variables(struct ast_category *cat);
void ast_category_rename(struct ast_category *cat, const char *name); void ast_category_rename(struct ast_category *cat, const char *name);
struct ast_variable *ast_variable_new(const char *name, const char *value); struct ast_variable *ast_variable_new(const char *name, const char *value);
void ast_variable_append(struct ast_category *category, struct ast_variable *variable); void ast_variable_append(struct ast_category *category, struct ast_variable *variable);
int ast_variable_delete(struct ast_category *category, char *variable, char *match); int ast_variable_delete(struct ast_category *category, const char *variable, const char *match);
int ast_variable_update(struct ast_category *category, char *variable, char *value, char *match); int ast_variable_update(struct ast_category *category, const char *variable, const char *value, const char *match);
int config_text_file_save(const char *filename, const struct ast_config *cfg, const char *generator); int config_text_file_save(const char *filename, const struct ast_config *cfg, const char *generator);

@ -425,7 +425,7 @@ struct ast_config *ast_config_new(void)
return config; return config;
} }
int ast_variable_delete(struct ast_category *category, char *variable, char *match) int ast_variable_delete(struct ast_category *category, const char *variable, const char *match)
{ {
struct ast_variable *cur, *prev=NULL, *curn; struct ast_variable *cur, *prev=NULL, *curn;
int res = -1; int res = -1;
@ -474,7 +474,7 @@ int ast_variable_delete(struct ast_category *category, char *variable, char *mat
return res; return res;
} }
int ast_variable_update(struct ast_category *category, char *variable, char *value, char *match) int ast_variable_update(struct ast_category *category, const char *variable, const char *value, const char *match)
{ {
struct ast_variable *cur, *prev=NULL, *newer; struct ast_variable *cur, *prev=NULL, *newer;
newer = ast_variable_new(variable, value); newer = ast_variable_new(variable, value);
@ -525,7 +525,7 @@ int ast_variable_update(struct ast_category *category, char *variable, char *val
return 0; return 0;
} }
int ast_category_delete(struct ast_config *cfg, char *category) int ast_category_delete(struct ast_config *cfg, const char *category)
{ {
struct ast_category *prev=NULL, *cat; struct ast_category *prev=NULL, *cat;
cat = cfg->root; cat = cfg->root;

@ -1047,13 +1047,13 @@ static void handle_updates(struct mansession *s, const struct message *m, struct
} }
} else if (!strcasecmp(action, "delcat")) { } else if (!strcasecmp(action, "delcat")) {
if (!ast_strlen_zero(cat)) if (!ast_strlen_zero(cat))
ast_category_delete(cfg, (char *) cat); ast_category_delete(cfg, cat);
} else if (!strcasecmp(action, "update")) { } else if (!strcasecmp(action, "update")) {
if (!ast_strlen_zero(cat) && !ast_strlen_zero(var) && (category = ast_category_get(cfg, cat))) if (!ast_strlen_zero(cat) && !ast_strlen_zero(var) && (category = ast_category_get(cfg, cat)))
ast_variable_update(category, (char *) var, (char *) value, (char *) match); ast_variable_update(category, var, value, match);
} else if (!strcasecmp(action, "delete")) { } else if (!strcasecmp(action, "delete")) {
if (!ast_strlen_zero(cat) && !ast_strlen_zero(var) && (category = ast_category_get(cfg, cat))) if (!ast_strlen_zero(cat) && !ast_strlen_zero(var) && (category = ast_category_get(cfg, cat)))
ast_variable_delete(category, (char *) var, (char *) match); ast_variable_delete(category, var, match);
} else if (!strcasecmp(action, "append")) { } else if (!strcasecmp(action, "append")) {
if (!ast_strlen_zero(cat) && !ast_strlen_zero(var) && if (!ast_strlen_zero(cat) && !ast_strlen_zero(var) &&
(category = ast_category_get(cfg, cat)) && (category = ast_category_get(cfg, cat)) &&

Loading…
Cancel
Save