Fix backwards and broken XML documentation.

(closes issue #18547)
Reported by: jcovert
Patches:
      xmldoc.c.patch uploaded by jcovert (license 551)
      chan_iax2.c.doc.patch uploaded by jcovert (license 551)
      chan_sip.c.patch uploaded by jcovert (license 551)
      chan_agent.c.patch uploaded by jcovert (license 551)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@300520 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index e0081ee30014b910dde8b11856b9d83177abcbae..48031e1c96788b61f71441a89863971449a9ad7c 100644 (file)
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -166,7 +166,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                </enumlist>
                        </parameter>
                </syntax>
-               <description />
+               <description></description>
        </function>
  ***/
 

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 1e54616d192d5a381c1280179157ee3f19d5dec3..952092db82bf805b3fa5055540d57338b0b05930 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -161,7 +161,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                </enumlist>
                        </parameter>
                </syntax>
-               <description />
+               <description></description>
                <see-also>
                        <ref type="function">SIPPEER</ref>
                </see-also>
@@ -173,7 +173,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                <syntax>
                        <parameter name="varname" required="true" />
                </syntax>
-               <description />
+               <description></description>
        </function>
  ***/
 

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 5636db78af56cdfeb9e86403054655a6e4d33338..a65a5891ead2ba137deeaac78c146b148e321eb5 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -421,7 +421,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                </enumlist>
                        </parameter>
                </syntax>
-               <description />
+               <description></description>
        </function>
        <function name="SIPCHANINFO" language="en_US">
                <synopsis>
@@ -455,7 +455,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                </enumlist>
                        </parameter>
                </syntax>
-               <description />
+               <description></description>
        </function>
        <function name="CHECKSIPDOMAIN" language="en_US">
                <synopsis>

diff --git a/main/xmldoc.c b/main/xmldoc.c
index f940a8f3f52acf9a8493de576f6d17ab9bbda663..a8d9c19416206666d2d5170031cca27bc721bcf3 100644 (file)
--- a/main/xmldoc.c
+++ b/main/xmldoc.c
@@ -1724,7 +1724,7 @@ static char *xmldoc_build_field(const char *type, const char *name, const char *
        node = ast_xml_find_element(ast_xml_node_get_children(node), var, NULL, NULL);
 
        if (!node || !ast_xml_node_get_children(node)) {
-               ast_log(LOG_DEBUG, "Cannot find variable '%s' in tree '%s'\n", name, var);
+               ast_log(LOG_DEBUG, "Cannot find variable '%s' in tree '%s'\n", var, name);
                return ret;
        }