diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-16 23:53:58 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-16 23:53:58 +0000 |
| commit | 5c0e56df213e669dd543a5996c77383a17a6ecd2 (patch) | |
| tree | 1298da607ca8facdbaf23866e9294b57e39057d9 /include | |
| parent | 5b13041e0f380ccdf5ce117653086312c4a3a7be (diff) | |
merge markster's usersconf branch with some slight changes
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43052 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/config.h | 1 | ||||
| -rw-r--r-- | include/asterisk/pbx.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/asterisk/config.h b/include/asterisk/config.h index 43e1d7480..720d6b971 100644 --- a/include/asterisk/config.h +++ b/include/asterisk/config.h @@ -172,6 +172,7 @@ int read_config_maps(void); struct ast_config *ast_config_new(void); 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); +char *ast_config_option(struct ast_config *cfg, const char *cat, const char *var); struct ast_category *ast_category_new(const char *name); void ast_category_append(struct ast_config *config, struct ast_category *cat); diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h index 397c49d76..c558289c7 100644 --- a/include/asterisk/pbx.h +++ b/include/asterisk/pbx.h @@ -174,6 +174,7 @@ int pbx_exec(struct ast_channel *c, struct ast_app *app, void *data); * \return NULL on failure, and an ast_context structure on success */ struct ast_context *ast_context_create(struct ast_context **extcontexts, const char *name, const char *registrar); +struct ast_context *ast_context_find_or_create(struct ast_context **extcontexts, const char *name, const char *registrar); /*! * \brief Merge the temporary contexts into a global contexts list and delete from the |