From: Russell Bryant Date: Thu, 10 Nov 2005 23:08:00 +0000 (+0000) Subject: issue #5709 X-Git-Tag: 1.2.0-rc2~41 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14d426098ed09365ee9842d892cf02c828db2d19;p=thirdparty%2Fasterisk.git issue #5709 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7050 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/ChangeLog b/ChangeLog index e304d03457..13765fc74c 100755 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ 2005-11-10 Russell Bryant + * many files: Change all references to ast_separate_app_args to ast_app_separate_args * many files in apps/: Clean up some application descriptions. Make sure all descriptions in changed files are wrapped at 80 characters. 2005-11-09 Russell Bryant @@ -185,7 +186,7 @@ * include/asterisk/channel.h: add parent_channel field * channel.c (__ast_request_and_dial): use parent_channel field to inherit variables into new channel - * apps/app_cut.c (cut_internal): use ast_separate_app_args() instead of open code (issue #5560) + * apps/app_cut.c (cut_internal): use ast_app_separate_args() instead of open code (issue #5560) * apps/app_mixmonitor.c (launch_monitor_thread): ast_strlen_zero can handle NULL input (issue #5561) (mixmonitor_exec): same diff --git a/apps/app_skel.c b/apps/app_skel.c index 974c03e3e5..f0731c4e3c 100755 --- a/apps/app_skel.c +++ b/apps/app_skel.c @@ -93,7 +93,7 @@ static int app_exec(struct ast_channel *chan, void *data) return -1; } - if ((argc = ast_separate_app_args(args, '|', argv, sizeof(argv) / sizeof(argv[0])))) { + if ((argc = ast_app_separate_args(args, '|', argv, sizeof(argv) / sizeof(argv[0])))) { dummy = argv[0]; options = argv[1]; ast_parseoptions(app_opts, &flags, opts, options); diff --git a/doc/CODING-GUIDELINES b/doc/CODING-GUIDELINES index bca2be766b..3d296a75ce 100755 --- a/doc/CODING-GUIDELINES +++ b/doc/CODING-GUIDELINES @@ -295,7 +295,7 @@ you intend to parse the incoming data string. - Separating arguments to dialplan applications and functions -Use ast_separate_app_args() to separate the arguments to your application +Use ast_app_separate_args() to separate the arguments to your application once you have made a local copy of the string. - Parsing strings with strsep diff --git a/include/asterisk/app.h b/include/asterisk/app.h index ef74f6543f..38b1fdb73f 100755 --- a/include/asterisk/app.h +++ b/include/asterisk/app.h @@ -190,13 +190,13 @@ int ast_app_group_match_get_count(char *groupmatch, char *category); \param arglist The list of arguments, defined using AST_APP_ARG This macro defines a structure intended to be used in a call - to ast_separate_app_args(). The structure includes all the + to ast_app_separate_args(). The structure includes all the arguments specified, plus an argv array that overlays them and an argc argument counter. The arguments must be declared using AST_APP_ARG, and they will all be character pointers (strings). \note The structure is not initialized, as the call to - ast_separate_app_args() will perform that function before parsing + ast_app_separate_args() will perform that function before parsing the arguments. */ #define AST_DECLARE_APP_ARGS(name, arglist) \