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

changes/08/3408/1
zuul 9 years ago committed by Gerrit Code Review
commit 01295fbdf4

@ -386,6 +386,11 @@ static int process_xml_use_node(xmlNode *node, struct member *mem)
return process_xml_ref_node(node, mem, &mem->uses); 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) static int process_xml_unknown_node(xmlNode *node, struct member *mem)
{ {
fprintf(stderr, "Encountered unknown node: %s\n", node->name); fprintf(stderr, "Encountered unknown node: %s\n", node->name);
@ -404,6 +409,7 @@ static const struct {
{ "depend", process_xml_depend_node }, { "depend", process_xml_depend_node },
{ "conflict", process_xml_conflict_node }, { "conflict", process_xml_conflict_node },
{ "use", process_xml_use_node }, { "use", process_xml_use_node },
{ "member_data", process_xml_member_data_node },
}; };
static node_handler lookup_node_handler(xmlNode *node) static node_handler lookup_node_handler(xmlNode *node)

@ -70,6 +70,8 @@ struct member {
const char *touch_on_change; const char *touch_on_change;
const char *support_level; const char *support_level;
const char *replacement; const char *replacement;
/*! member_data is just an opaque, member-specific string */
const char *member_data;
/*! This module is currently selected */ /*! This module is currently selected */
unsigned int enabled:1; unsigned int enabled:1;
/*! This module was enabled when the config was loaded */ /*! This module was enabled when the config was loaded */

Loading…
Cancel
Save