[asterisk-commits] menuselect: Add an opaque "member data" string to the accep... (asterisk[13])

[SVN commits to the Asterisk project]

Joshua Colp has submitted this change and it was merged.

Change subject: menuselect:  Add an opaque "member_data" string to the acceptable xml
......................................................................


menuselect:  Add an opaque "member_data" string to the acceptable xml

Change-Id: Id5ac43b95c8d7395f3be37f983632169db3d1afe
---
M menuselect/menuselect.c
M menuselect/menuselect.h
2 files changed, 8 insertions(+), 0 deletions(-)

Approvals:
  Kevin Harwell: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved; Verified



diff --git a/menuselect/menuselect.c b/menuselect/menuselect.c
index f6a7fb3..da972d8 100644
--- a/menuselect/menuselect.c
+++ b/menuselect/menuselect.c
@@ -386,6 +386,11 @@
 	return process_xml_ref_node(node, mem, &mem->uses);
 }
 
+static int process_xml_member_data_node(xmlNode *node, struct member *mem)
+{
+	return 0;
+}
+
 static int process_xml_unknown_node(xmlNode *node, struct member *mem)
 {
 	fprintf(stderr, "Encountered unknown node: %s\n", node->name);
@@ -404,6 +409,7 @@
 	{ "depend",         process_xml_depend_node         },
 	{ "conflict",       process_xml_conflict_node       },
 	{ "use",            process_xml_use_node            },
+	{ "member_data",    process_xml_member_data_node    },
 };
 
 static node_handler lookup_node_handler(xmlNode *node)
diff --git a/menuselect/menuselect.h b/menuselect/menuselect.h
index 328ac9a..bf2bf4c 100644
--- a/menuselect/menuselect.h
+++ b/menuselect/menuselect.h
@@ -70,6 +70,8 @@
 	const char *touch_on_change;
 	const char *support_level;
 	const char *replacement;
+	/*! member_data is just an opaque, member-specific string */
+	const char *member_data;
 	/*! This module is currently selected */
 	unsigned int enabled:1;
 	/*! This module was enabled when the config was loaded */

-- 
To view, visit https://gerrit.asterisk.org/3385
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id5ac43b95c8d7395f3be37f983632169db3d1afe
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>