Make things work again

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
changes/78/78/1
Matthew Jordan 13 years ago
parent d4e25a456e
commit bcc0aca23d

@ -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.

@ -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. */

Loading…
Cancel
Save