From 870f98f02de56e35b87f511544a6cda3d4d8fe69 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Sat, 3 Dec 2005 19:25:33 +0000 Subject: Bug 5858 - Make the chanvars.c functions return a 'const char *' This should prevent us from unintentionally changing variable values when they're returned from pbx_builtin_getvar_helper. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7304 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/app.h | 8 ++++---- include/asterisk/channel.h | 6 +++--- include/asterisk/chanvars.h | 6 +++--- include/asterisk/frame.h | 2 +- include/asterisk/pbx.h | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) (limited to 'include') diff --git a/include/asterisk/app.h b/include/asterisk/app.h index 38b1fdb73..b40c2ce4c 100644 --- a/include/asterisk/app.h +++ b/include/asterisk/app.h @@ -167,16 +167,16 @@ char *ast_read_textfile(const char *file); #define GROUP_CATEGORY_PREFIX "GROUP" /*! Split a group string into group and category, returning a default category if none is provided. */ -int ast_app_group_split_group(char *data, char *group, int group_max, char *category, int category_max); +int ast_app_group_split_group(const char *data, char *group, int group_max, char *category, int category_max); /*! Set the group for a channel, splitting the provided data into group and category, if specified. */ -int ast_app_group_set_channel(struct ast_channel *chan, char *data); +int ast_app_group_set_channel(struct ast_channel *chan, const char *data); /*! Get the current channel count of the specified group and category. */ -int ast_app_group_get_count(char *group, char *category); +int ast_app_group_get_count(const char *group, const char *category); /*! Get the current channel count of all groups that match the specified pattern and category. */ -int ast_app_group_match_get_count(char *groupmatch, char *category); +int ast_app_group_match_get_count(const char *groupmatch, const char *category); /*! \brief Define an application argument diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 6a4ff373f..6829f83f6 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -454,9 +454,9 @@ struct ast_bridge_config { long timelimit; long play_warning; long warning_freq; - char *warning_sound; - char *end_sound; - char *start_sound; + const char *warning_sound; + const char *end_sound; + const char *start_sound; int firstpass; unsigned int flags; }; diff --git a/include/asterisk/chanvars.h b/include/asterisk/chanvars.h index d31c05e86..63de58429 100644 --- a/include/asterisk/chanvars.h +++ b/include/asterisk/chanvars.h @@ -35,8 +35,8 @@ AST_LIST_HEAD_NOLOCK(varshead, ast_var_t); struct ast_var_t *ast_var_assign(const char *name, const char *value); void ast_var_delete(struct ast_var_t *var); -char *ast_var_name(struct ast_var_t *var); -char *ast_var_full_name(struct ast_var_t *var); -char *ast_var_value(struct ast_var_t *var); +const char *ast_var_name(const struct ast_var_t *var); +const char *ast_var_full_name(const struct ast_var_t *var); +const char *ast_var_value(const struct ast_var_t *var); #endif /* _ASTERISK_CHANVARS_H */ diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h index ccba41539..62c0b0dc0 100644 --- a/include/asterisk/frame.h +++ b/include/asterisk/frame.h @@ -389,7 +389,7 @@ extern char* ast_getformatname_multiple(char *buf, size_t size, int format); * \param name string of format * \return This returns the form of the format in binary on success, 0 on error. */ -extern int ast_getformatbyname(char *name); +extern int ast_getformatbyname(const char *name); /*! \brief Get a name from a format * Gets a name from a format diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h index a10546174..9332b9e6a 100644 --- a/include/asterisk/pbx.h +++ b/include/asterisk/pbx.h @@ -605,7 +605,7 @@ struct ast_ignorepat *ast_walk_context_ignorepats(struct ast_context *con, struct ast_sw *ast_walk_context_switches(struct ast_context *con, struct ast_sw *sw); int pbx_builtin_serialize_variables(struct ast_channel *chan, char *buf, size_t size); -extern char *pbx_builtin_getvar_helper(struct ast_channel *chan, const char *name); +extern const char *pbx_builtin_getvar_helper(struct ast_channel *chan, const char *name); extern void pbx_builtin_pushvar_helper(struct ast_channel *chan, const char *name, const char *value); extern void pbx_builtin_setvar_helper(struct ast_channel *chan, const char *name, const char *value); extern void pbx_retrieve_variable(struct ast_channel *c, const char *var, char **ret, char *workspace, int workspacelen, struct varshead *headp); @@ -620,11 +620,11 @@ int ast_extension_patmatch(const char *pattern, const char *data); set to 1, sets to auto fall through. If newval set to 0, sets to no auto fall through (reads extension instead). Returns previous value. */ extern int pbx_set_autofallthrough(int newval); -int ast_goto_if_exists(struct ast_channel *chan, char* context, char *exten, int priority); +int ast_goto_if_exists(struct ast_channel *chan, const char *context, const char *exten, int priority); /* I can find neither parsable nor parseable at dictionary.com, but google gives me 169000 hits for parseable and only 49,800 for parsable */ int ast_parseable_goto(struct ast_channel *chan, const char *goto_string); int ast_explicit_goto(struct ast_channel *chan, const char *context, const char *exten, int priority); -int ast_async_goto_if_exists(struct ast_channel *chan, char* context, char *exten, int priority); +int ast_async_goto_if_exists(struct ast_channel *chan, const char *context, const char *exten, int priority); struct ast_custom_function* ast_custom_function_find(char *name); int ast_custom_function_unregister(struct ast_custom_function *acf); -- cgit v1.2.3