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

diff --git a/include/asterisk/app.h b/include/asterisk/app.h
index 87e0b5d415a41cecd86ed682deb798e2925c9036..75d1fbb7ece81af42f8d1842d681d2cadcd1d3e0 100644 (file)
--- a/include/asterisk/app.h
+++ b/include/asterisk/app.h
@@ -864,13 +864,13 @@ int ast_app_group_list_unlock(void);
   \param parse A modifiable buffer containing the input to be parsed
 
   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.
  */
 #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) \
-       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.

diff --git a/main/xmldoc.c b/main/xmldoc.c
index 2ede8240edba18574eaac3ef07ebba5fb698a689..2dd343263290e9a0fc015baf929b4fb3dc2e47a7 100644 (file)
--- a/main/xmldoc.c
+++ b/main/xmldoc.c
@@ -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
-       defaults to '|'. */
+       defaults to ','. */
        attrargsep = ast_xml_get_attribute(rootnode, "argsep");
        if (attrargsep) {
                argsep = ast_strdupa(attrargsep);
                ast_xml_free_attr(attrargsep);
        } else {
-               argsep = ast_strdupa("|");
+               argsep = ast_strdupa(",");
        }
 
        /* Get order of evaluation. */