oval_set.c		oval_set.c
	skipping to change at line 285		skipping to change at line 285
	struct oval_parser_context *context;		struct oval_parser_context *context;
	struct oval_setobject *set;		struct oval_setobject *set;
	};		};
	static void oval_consume_object_ref(char *objref, void *user)		static void oval_consume_object_ref(char *objref, void *user)
	{		{
	__attribute__nonnull__(user);		__attribute__nonnull__(user);
	struct oval_set_context *ctx = user;		struct oval_set_context *ctx = user;
	struct oval_definition_model *model = ctx->context->definition_model ;		struct oval_definition_model *model = ctx->context->definition_model ;
	struct oval_object *object = oval_object_get_new(model, objref);		struct oval_object *object = oval_definition_model_get_new_object(mo del, objref);
	oval_setobject_add_object(ctx->set, object);		oval_setobject_add_object(ctx->set, object);
	}		}
	static void oval_set_consume_filter(struct oval_filter *filter, void *set)		static void oval_set_consume_filter(struct oval_filter *filter, void *set)
	{		{
	oval_setobject_add_filter(set, filter);		oval_setobject_add_filter(set, filter);
	}		}
	static int _oval_set_parse_tag(xmlTextReaderPtr reader, struct oval_parser_ context *context, void *user)		static int _oval_set_parse_tag(xmlTextReaderPtr reader, struct oval_parser_ context *context, void *user)
	{		{
	skipping to change at line 360		skipping to change at line 360
	int return_code = oval_parser_parse_tag(reader, context, &_oval_set_ parse_tag, set);		int return_code = oval_parser_parse_tag(reader, context, &_oval_set_ parse_tag, set);
	oscap_free(tagname);		oscap_free(tagname);
	oscap_free(namespace);		oscap_free(namespace);
	return return_code;		return return_code;
	}		}
	xmlNode *oval_set_to_dom(struct oval_setobject *set, xmlDoc * doc, xmlNode * parent) {		xmlNode *oval_set_to_dom(struct oval_setobject *set, xmlDoc * doc, xmlNode * parent) {
	xmlNs *ns_definitions = xmlSearchNsByHref(doc, parent, OVAL_DEFINITI ONS_NAMESPACE);		xmlNs *ns_definitions = xmlSearchNsByHref(doc, parent, OVAL_DEFINITI ONS_NAMESPACE);
	xmlNode *set_node = xmlNewTextChild(parent, ns_definitions, BAD_CAST "set", NULL);		xmlNode *set_node = xmlNewTextChild(parent, ns_definitions, BAD_CAST "set", NULL);
	if (ns_definitions == NULL) {
	ns_definitions = xmlNewNs(set_node, OVAL_DEFINITIONS_NAMESPA
	CE, NULL);
	xmlSetNs(set_node, ns_definitions);
	}
	oval_setobject_operation_t operation = oval_setobject_get_operation( set);		oval_setobject_operation_t operation = oval_setobject_get_operation( set);
	if (operation != OVAL_SET_OPERATION_UNION)		if (operation != OVAL_SET_OPERATION_UNION)
	xmlNewProp(set_node, BAD_CAST "set_operator", BAD_CAST oval_ set_operation_get_text(operation));		xmlNewProp(set_node, BAD_CAST "set_operator", BAD_CAST oval_ set_operation_get_text(operation));
	switch (oval_setobject_get_type(set)) {		switch (oval_setobject_get_type(set)) {
	case OVAL_SET_AGGREGATE:{		case OVAL_SET_AGGREGATE:{
	struct oval_setobject_iterator *subsets = oval_setob ject_get_subsets(set);		struct oval_setobject_iterator *subsets = oval_setob ject_get_subsets(set);
	while (oval_setobject_iterator_has_more(subsets)) {		while (oval_setobject_iterator_has_more(subsets)) {
	struct oval_setobject *subset = oval_setobje ct_iterator_next(subsets);		struct oval_setobject *subset = oval_setobje ct_iterator_next(subsets);
End of changes. 2 change blocks.
	6 lines changed or deleted		1 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/