Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Simplify some code in ast_app_run_sub().

Browse Source 
* Remove unnnecessary const from const char * const var declaration in the
ast_app_run_macro() and ast_app_run_sub() prototypes.  The second const is
unnecessary.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@359904 65c4cc65-6c06-0410-ace0-fbb531ad65f3
certified/11.2
Richard Mudgett 13 years ago
parent 827f2eae92
commit dd4a3b1825
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File

8
include/asterisk/app.h
Unescape View File

@ -131,8 +131,8 @@ int ast_app_getdata_full(struct ast_channel *c, const char *prompt, char *s, int
* \retval 0 success * \retval 0 success
* \retval -1 failure * \retval -1 failure
*/ */
int ast_app_run_macro(struct ast_channel *autoservice_chan, struct ast_channel int ast_app_run_macro(struct ast_channel *autoservice_chan,
*macro_chan, const char * const macro_name, const char * const macro_args); struct ast_channel *macro_chan, const char *macro_name, const char *macro_args);
/*! /*!
* \since 11 * \since 11
@ -151,8 +151,8 @@ int ast_app_run_macro(struct ast_channel *autoservice_chan, struct ast_channel
* \retval 0 success * \retval 0 success
* \retval -1 failure * \retval -1 failure
*/ */
int ast_app_run_sub(struct ast_channel *autoservice_chan, struct ast_channel int ast_app_run_sub(struct ast_channel *autoservice_chan,
*sub_chan, const char * const name, const char * const args); struct ast_channel *sub_chan, const char *name, const char *args);
/*! /*!
* \brief Set voicemail function callbacks * \brief Set voicemail function callbacks

14
main/app.c
Unescape View File

@ -281,22 +281,24 @@ static int app_exec_dialplan(struct ast_channel *autoservice_chan, struct ast_ch
return res; return res;
} }
int ast_app_run_macro(struct ast_channel *autoservice_chan, struct ast_channel *macro_chan, const char * const name, const char * const args) int ast_app_run_macro(struct ast_channel *autoservice_chan, struct ast_channel *macro_chan, const char *name, const char *args)
{ {
char buf[1024]; char buf[1024];
snprintf(buf, sizeof(buf), "%s%s%s", name, ast_strlen_zero(args) ? "" : ",", S_OR(args, "")); snprintf(buf, sizeof(buf), "%s%s%s", name, ast_strlen_zero(args) ? "" : ",", S_OR(args, ""));
return app_exec_dialplan(autoservice_chan, macro_chan, buf, 0); return app_exec_dialplan(autoservice_chan, macro_chan, buf, 0);
} }
int ast_app_run_sub(struct ast_channel *autoservice_chan, struct ast_channel *sub_chan, const char * const location, const char * const args) int ast_app_run_sub(struct ast_channel *autoservice_chan, struct ast_channel *sub_chan, const char *location, const char *args)
{ {
char buf[1024]; char buf[1024];
size_t offset = snprintf(buf, sizeof(buf), "%s", location); size_t offset = snprintf(buf, sizeof(buf), "%s", location);
/* need to bump the priority by one if we already have a pbx */ /* need to bump the priority by one if we already have a pbx */
if (ast_channel_pbx(sub_chan)) { if (ast_channel_pbx(sub_chan)) {
int iprio; int iprio;
const char * priority = location; const char *priority = location;
const char * next = strchr(priority,','); const char *next = strchr(priority,',');
/* jump to the priority portion of the location */ /* jump to the priority portion of the location */
if (next) { if (next) {
priority = next + 1; priority = next + 1;
@ -314,8 +316,8 @@ int ast_app_run_sub(struct ast_channel *autoservice_chan, struct ast_channel *su
} }
} }
} }
if (offset < sizeof(buf)) { if (!ast_strlen_zero(args) && offset < sizeof(buf)) {
snprintf(buf + offset, sizeof(buf) - offset, "%s%s%s", ast_strlen_zero(args) ? "" : "(", S_OR(args, ""), ast_strlen_zero(args) ? "" : ")"); snprintf(buf + offset, sizeof(buf) - offset, "(%s)", args);
} }
return app_exec_dialplan(autoservice_chan, sub_chan, buf, 1); return app_exec_dialplan(autoservice_chan, sub_chan, buf, 1);
} }

Write Preview
Loading…
Cancel
Save