kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 11:42:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make things work again

Browse Source 
Sorry folks. ',' are still greater than '|'.

Thanks for playing along :-)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@384514 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2013-04-02 11:40:05 +00:00
parent d4e25a456e
commit bcc0aca23d
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/asterisk/app.h
View File

@@ -864,13 +864,13 @@ int ast_app_group_list_unlock(void);
\param parse A modifiable buffer containing the input to be parsed \param parse A modifiable buffer containing the input to be parsed
This function will separate the input string using the standard argument This function will separate the input string using the standard argument
separator character '|' and fill in the provided structure, including separator character ',' and fill in the provided structure, including
the argc argument counter field. the argc argument counter field.
*/ */
#define AST_STANDARD_APP_ARGS(args, parse) \ #define AST_STANDARD_APP_ARGS(args, parse) \
args.argc = __ast_app_separate_args(parse, '|', 1, args.argv, ((sizeof(args) - offsetof(typeof(args), argv)) / sizeof(args.argv[0]))) args.argc = __ast_app_separate_args(parse, ',', 1, args.argv, ((sizeof(args) - offsetof(typeof(args), argv)) / sizeof(args.argv[0])))
#define AST_STANDARD_RAW_ARGS(args, parse) \ #define AST_STANDARD_RAW_ARGS(args, parse) \
args.argc = __ast_app_separate_args(parse, '|', 0, args.argv, ((sizeof(args) - offsetof(typeof(args), argv)) / sizeof(args.argv[0]))) args.argc = __ast_app_separate_args(parse, ',', 0, args.argv, ((sizeof(args) - offsetof(typeof(args), argv)) / sizeof(args.argv[0])))
/*! /*!
\brief Performs the 'nonstandard' argument separation process for an application. \brief Performs the 'nonstandard' argument separation process for an application.

4
main/xmldoc.c
View File

@@ -709,13 +709,13 @@ static char *xmldoc_get_syntax_fun(struct ast_xml_node *rootnode, const char *ro
} }
/* Get the argument separator from the root node attribute name 'argsep', if not found /* Get the argument separator from the root node attribute name 'argsep', if not found
defaults to '|'. */ defaults to ','. */
attrargsep = ast_xml_get_attribute(rootnode, "argsep"); attrargsep = ast_xml_get_attribute(rootnode, "argsep");
if (attrargsep) { if (attrargsep) {
argsep = ast_strdupa(attrargsep); argsep = ast_strdupa(attrargsep);
ast_xml_free_attr(attrargsep); ast_xml_free_attr(attrargsep);
} else { } else {
argsep = ast_strdupa("|"); argsep = ast_strdupa(",");
} }
/* Get order of evaluation. */ /* Get order of evaluation. */