From 77c41d700eb96bb2e977020467f6a7d15698b669 Mon Sep 17 00:00:00 2001
From: "Eliel C. Sardanons" <eliels@gmail.com>
Date: Fri, 15 May 2009 13:23:37 +0000
Subject: [PATCH] Allow to specify an enumlist inside an enum.
It was not possible to use an enumlist inside an enum:
<enumlist>
<enum name="aa">
<enumlist>
...
</enumlist>
</enum>
</enumlist>
Now we will be able to insert as many levels as we want.
(closes issue #15112)
Reported by: lmadsen
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@194635 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
doc/appdocsxml.dtd | 2 +-
main/xmldoc.c | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/doc/appdocsxml.dtd b/doc/appdocsxml.dtd
index 8ac6ac587c..ba0ef2726c 100644
--- a/doc/appdocsxml.dtd
+++ b/doc/appdocsxml.dtd
@@ -41,7 +41,7 @@
<!ATTLIST option hasparams CDATA "">
<!ELEMENT enumlist (enum+)>
- <!ELEMENT enum (para|note|warning|parameter)*>
+ <!ELEMENT enum (para|note|warning|parameter|enumlist)*>
<!ATTLIST enum name CDATA "">
<!ELEMENT argument (para|note|warning|variablelist|argument)*>
diff --git a/main/xmldoc.c b/main/xmldoc.c
index 2ddb201796..29d951ac56 100644
--- a/main/xmldoc.c
+++ b/main/xmldoc.c
@@ -60,6 +60,7 @@ struct documentation_tree {
};
static char *xmldoc_get_syntax_cmd(struct ast_xml_node *fixnode, const char *name, int printname);
+static int xmldoc_parse_enumlist(struct ast_xml_node *fixnode, const char *tabs, struct ast_str **buffer);
/*!
* \brief Container of documentation trees
@@ -1400,6 +1401,9 @@ static int xmldoc_parse_enum(struct ast_xml_node *fixnode, const char *tabs, str
{
struct ast_xml_node *node = fixnode;
int ret = 0;
+ char *optiontabs;
+
+ ast_asprintf(&optiontabs, "%s ", tabs);
for (node = ast_xml_node_get_children(node); node; node = ast_xml_node_get_next(node)) {
if ((xmldoc_parse_para(node, (ret ? tabs : " - "), "\n", buffer))) {
@@ -1407,7 +1411,12 @@ static int xmldoc_parse_enum(struct ast_xml_node *fixnode, const char *tabs, str
} else if ((xmldoc_parse_specialtags(node, (ret ? tabs : " - "), "\n", buffer))) {
ret = 1;
}
+
+ xmldoc_parse_enumlist(node, optiontabs, buffer);
}
+
+ ast_free(optiontabs);
+
return ret;
}
--
GitLab