[Asterisk-code-review] Revert "PJSIP_CONTACT: add missing argument documentation" (asterisk[16])

[Joshua Colp]

Hello Pascal Cadotte Michaud, Kevin Harwell, Friendly Automation, Benjamin Keith Ford,

I'd like you to do a code review. Please visit

    https://gerrit.asterisk.org/c/asterisk/+/13398

to review the following change.


Change subject: Revert "PJSIP_CONTACT: add missing argument documentation"
......................................................................

Revert "PJSIP_CONTACT: add missing argument documentation"

This reverts commit 174e6426aa8a8c26d83c5e06cfbc77277c2f5934.

Reason for revert: Regression in XML validation.

validity error : Content model of enumlist is not determinist:
(configOptionToEnum | (configOptionToEnum , enum+) | enum+)

As we are preparing to do releases and this is not critical
I am reverting this for now until resolved.

Change-Id: I2c9656fb40b2d2f56f54caa35c8be02cc92babd0
---
M doc/appdocsxml.dtd
M funcs/func_pjsip_contact.c
2 files changed, 1 insertion(+), 7 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/98/13398/1

diff --git a/doc/appdocsxml.dtd b/doc/appdocsxml.dtd
index 9f00ee5..21f1b9d 100644
--- a/doc/appdocsxml.dtd
+++ b/doc/appdocsxml.dtd
@@ -110,7 +110,7 @@
   <!ATTLIST option implies CDATA "">
   <!ATTLIST option hasparams CDATA "">
 
-  <!ELEMENT enumlist (configOptionToEnum|(configOptionToEnum,enum+)|enum+)>
+  <!ELEMENT enumlist (configOptionToEnum|enum+)>
   <!ELEMENT enum (para|note|warning|parameter|enumlist|info|xi:include)*>
   <!ATTLIST enum name CDATA "">
 
diff --git a/funcs/func_pjsip_contact.c b/funcs/func_pjsip_contact.c
index 9d4ba68..91f2f77 100644
--- a/funcs/func_pjsip_contact.c
+++ b/funcs/func_pjsip_contact.c
@@ -60,12 +60,6 @@
 					<configOptionToEnum>
 						<xi:include xpointer="xpointer(/docs/configInfo[@name='res_pjsip']/configFile[@name='pjsip.conf']/configObject[@name='contact']/configOption)"/>
 					</configOptionToEnum>
-					<enum name="rtt">
-						<para>The RTT of the last qualify</para>
-					</enum>
-					<enum name="status">
-						<para>Status of the contact</para>
-					</enum>
 				</enumlist>
 			</parameter>
 		</syntax>

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/13398
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 16
Gerrit-Change-Id: I2c9656fb40b2d2f56f54caa35c8be02cc92babd0
Gerrit-Change-Number: 13398
Gerrit-PatchSet: 1
Gerrit-Owner: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Benjamin Keith Ford <bford at digium.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Pascal Cadotte Michaud <pcm at wazo.io>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20191211/be7d9461/attachment-0001.html>