oscap.h		oscap.h
	skipping to change at line 132		skipping to change at line 132
	/**		/**
	* Iterate over an array of strings, given an iterator.		* Iterate over an array of strings, given an iterator.
	* @param val name of an variable the member will be sequentially stored in		* @param val name of an variable the member will be sequentially stored in
	* @param init_val initial member value (i.e. an iterator pointing to the s tart element)		* @param init_val initial member value (i.e. an iterator pointing to the s tart element)
	* @see OSCAP_FOR_GENERIC		* @see OSCAP_FOR_GENERIC
	*/		*/
	#define OSCAP_FOR_STR(val, init_val) OSCAP_FOR_GENERIC(oscap_string, const char *, val, init_val)		#define OSCAP_FOR_STR(val, init_val) OSCAP_FOR_GENERIC(oscap_string, const char *, val, init_val)
	/** @} */		/** @} */
			/// OS-specific filesystem path delimiter
			extern const char * const OSCAP_OS_PATH_DELIM;
			/// Default XML Schema path (if not overridden by the environment variable)
			extern const char * const OSCAP_SCHEMA_PATH;
			/// Default XSLT path (if not overridden by the environment variable)
			extern const char * const OSCAP_XSLT_PATH;
	/**		/**
	* Initialize OpenSCAP library.		* Initialize OpenSCAP library.
	*		*
	* This is currently needed only in multithreaded applications		* This is currently needed only in multithreaded applications
	* (needs to be called before any child threads are spawned)		* (needs to be called before any child threads are spawned)
	* or applications using the XSLT facility w/ EXSLT extensions.		* or applications using the XSLT facility w/ EXSLT extensions.
	* However, it is a good practice to call this function		* However, it is a good practice to call this function
	* always at the beginning of the program execution.		* always at the beginning of the program execution.
	*/		*/
	void oscap_init(void);		void oscap_init(void);
	skipping to change at line 164		skipping to change at line 173
	/**		/**
	* @addtogroup VALID		* @addtogroup VALID
	* @{		* @{
	* XML schema based validation of XML representations of SCAP documents.		* XML schema based validation of XML representations of SCAP documents.
	*/		*/
	/// SCAP document type identifiers		/// SCAP document type identifiers
	typedef enum oscap_document_type {		typedef enum oscap_document_type {
	OSCAP_DOCUMENT_OVAL_DEFINITIONS = 1, ///< OVAL Definitions file		OSCAP_DOCUMENT_OVAL_DEFINITIONS = 1, ///< OVAL Definitions file
			OSCAP_DOCUMENT_OVAL_VARIABLES, ///< OVAL Variables
	OSCAP_DOCUMENT_OVAL_SYSCHAR, ///< OVAL system characteristi cs file		OSCAP_DOCUMENT_OVAL_SYSCHAR, ///< OVAL system characteristi cs file
	OSCAP_DOCUMENT_OVAL_RESULTS, ///< OVAL results file		OSCAP_DOCUMENT_OVAL_RESULTS, ///< OVAL results file
	OSCAP_DOCUMENT_XCCDF, ///< XCCDF benchmark file		OSCAP_DOCUMENT_XCCDF, ///< XCCDF benchmark file
	OSCAP_DOCUMENT_CPE_LANGUAGE, ///< CPE language file		OSCAP_DOCUMENT_CPE_LANGUAGE, ///< CPE language file
	OSCAP_DOCUMENT_CPE_DICTIONARY, ///< CPE dictionary file		OSCAP_DOCUMENT_CPE_DICTIONARY, ///< CPE dictionary file
	} oscap_document_type_t;		} oscap_document_type_t;
	/**		/**
	* Validate a SCAP document file against a XML schema.		* Validate a SCAP document file against a XML schema.
	*		*
	skipping to change at line 205		skipping to change at line 215
	* If the variable does not exist a default path is used (usually something like $PREFIX/share/openscap/schemas).		* If the variable does not exist a default path is used (usually something like $PREFIX/share/openscap/schemas).
	*		*
	* @param xmlfile File to be transformed.		* @param xmlfile File to be transformed.
	* @param xsltfile XSLT filename		* @param xsltfile XSLT filename
	* @param outfile Result file shall be written here (NULL for stdout).		* @param outfile Result file shall be written here (NULL for stdout).
	* @param params list of key-value pairs to pass to the stylesheet.		* @param params list of key-value pairs to pass to the stylesheet.
	* @return Success or failure.		* @return Success or failure.
	*/		*/
	bool oscap_apply_xslt(const char *xmlfile, const char *xsltfile, const char *outfile, const char **params);		bool oscap_apply_xslt(const char *xmlfile, const char *xsltfile, const char *outfile, const char **params);
			/**
			* Apply XSLT stylesheet to a XML file.
			*
			* This function lets user specify environment variable with
			* a XSL stylesheet search path(s) and a fallback path if the variable is n
			ot defined.
			* Except for this it is completely identical to oscap_apply_xslt().
			*
			* @param xmlfile File to be transformed.
			* @param xsltfile XSLT filename
			* @param outfile Result file shall be written here (NULL for stdout).
			* @param params list of key-value pairs to pass to the stylesheet.
			* @return Success or failure.
			*/
			bool oscap_apply_xslt_var(const char *xmlfile, const char *xsltfile, const
			char *outfile, const char **params, const char *pathvar, const char *defpat
			h);
	/************************************************************/		/************************************************************/
	/** @} validation group end */		/** @} validation group end */
	/** @} */		/** @} */
	#endif		#endif
End of changes. 3 change blocks.
	0 lines changed or deleted		28 lines changed or added

	oval_agent_api.h		oval_agent_api.h
	skipping to change at line 69		skipping to change at line 69
	/**		/**
	* Create new session for OVAL agent from OVAL definition model		* Create new session for OVAL agent from OVAL definition model
	* @param model OVAL Definition model		* @param model OVAL Definition model
	* @param name Name of file that can be referenced from XCCDF Benchmark		* @param name Name of file that can be referenced from XCCDF Benchmark
	*/		*/
	oval_agent_session_t * oval_agent_new_session(struct oval_definition_model * model, const char * name);		oval_agent_session_t * oval_agent_new_session(struct oval_definition_model * model, const char * name);
	/**		/**
	* Probe the system and evaluate specified definition		* Probe the system and evaluate specified definition
	*/		*/
	oval_result_t oval_agent_eval_definition(oval_agent_session_t * ag_sess, co		int oval_agent_eval_definition(oval_agent_session_t *, const char *);
	nst char *id);
			/**
			* Get the OVAL result of a definition from an agent session
			*/
			oval_result_t oval_agent_get_definition_result(oval_agent_session_t *, cons
			t char *);
	/**		/**
	* Clean resuls that were generated in this agent session		* Clean resuls that were generated in this agent session
	*/		*/
	int oval_agent_reset_session(oval_agent_session_t * ag_sess);		int oval_agent_reset_session(oval_agent_session_t * ag_sess);
	/**		/**
	* Abort a running probe session		* Abort a running probe session
	*/		*/
	int oval_agent_abort_session(oval_agent_session_t *ag_sess);		int oval_agent_abort_session(oval_agent_session_t *ag_sess);
End of changes. 1 change blocks.
	2 lines changed or deleted		7 lines changed or added

	oval_definitions.h		oval_definitions.h
	skipping to change at line 163		skipping to change at line 163
	OVAL_DATATYPE_BINARY = 1,		OVAL_DATATYPE_BINARY = 1,
	OVAL_DATATYPE_BOOLEAN = 2,		OVAL_DATATYPE_BOOLEAN = 2,
	OVAL_DATATYPE_EVR_STRING = 3,		OVAL_DATATYPE_EVR_STRING = 3,
	OVAL_DATATYPE_FILESET_REVISION = 4,		OVAL_DATATYPE_FILESET_REVISION = 4,
	OVAL_DATATYPE_FLOAT = 5,		OVAL_DATATYPE_FLOAT = 5,
	OVAL_DATATYPE_IOS_VERSION = 6,		OVAL_DATATYPE_IOS_VERSION = 6,
	OVAL_DATATYPE_VERSION = 7,		OVAL_DATATYPE_VERSION = 7,
	OVAL_DATATYPE_INTEGER = 8,		OVAL_DATATYPE_INTEGER = 8,
	OVAL_DATATYPE_STRING = 9,		OVAL_DATATYPE_STRING = 9,
	OVAL_DATATYPE_RECORD = 10,		OVAL_DATATYPE_RECORD = 10,
	OVAL_DATATYPE_SEXP = 11		OVAL_DATATYPE_SEXP = 11,
			OVAL_DATATYPE_STRING_M = 12
	} oval_datatype_t;		} oval_datatype_t;
	/// Varref types		/// Varref types
	typedef enum {		typedef enum {
	OVAL_ENTITY_VARREF_UNKNOWN,		OVAL_ENTITY_VARREF_UNKNOWN,
	OVAL_ENTITY_VARREF_NONE,		OVAL_ENTITY_VARREF_NONE,
	OVAL_ENTITY_VARREF_ATTRIBUTE,		OVAL_ENTITY_VARREF_ATTRIBUTE,
	OVAL_ENTITY_VARREF_ELEMENT		OVAL_ENTITY_VARREF_ELEMENT
	} oval_entity_varref_type_t;		} oval_entity_varref_type_t;
	skipping to change at line 257		skipping to change at line 258
	const char *oval_family_get_text(oval_family_t);		const char *oval_family_get_text(oval_family_t);
	const char *oval_check_get_text(oval_check_t);		const char *oval_check_get_text(oval_check_t);
	const char *oval_existence_get_text(oval_existence_t);		const char *oval_existence_get_text(oval_existence_t);
	const char *oval_affected_family_get_text(oval_affected_family_t);		const char *oval_affected_family_get_text(oval_affected_family_t);
	const char *oval_datatype_get_text(oval_datatype_t);		const char *oval_datatype_get_text(oval_datatype_t);
	oval_datatype_t oval_datatype_from_text(const char *);		oval_datatype_t oval_datatype_from_text(const char *);
	const char *oval_operation_get_text(oval_operation_t);		const char *oval_operation_get_text(oval_operation_t);
	const char *oval_set_operation_get_text(oval_setobject_operation_t);		const char *oval_set_operation_get_text(oval_setobject_operation_t);
	const char *oval_datetime_format_get_text(oval_datetime_format_t);		const char *oval_datetime_format_get_text(oval_datetime_format_t);
	const char *oval_arithmetic_operation_get_text(oval_arithmetic_operation_t) ;		const char *oval_arithmetic_operation_get_text(oval_arithmetic_operation_t) ;
			const char *oval_filter_action_get_text(oval_filter_action_t);
	/**		/**
	* @struct oval_definition_model		* @struct oval_definition_model
	* Oval definition model		* Oval definition model
	*/		*/
	struct oval_definition_model;		struct oval_definition_model;
	/**		/**
	* @struct oval_definition		* @struct oval_definition
	* Oval definition specification.		* Oval definition specification.
	skipping to change at line 588		skipping to change at line 590
	*/		*/
	struct oval_generator;		struct oval_generator;
	struct oval_generator *oval_generator_new(void);		struct oval_generator *oval_generator_new(void);
	void oval_generator_free(struct oval_generator *generator);		void oval_generator_free(struct oval_generator *generator);
	struct oval_generator *oval_generator_clone(struct oval_generator *old_gene rator);		struct oval_generator *oval_generator_clone(struct oval_generator *old_gene rator);
	char *oval_generator_get_product_name(struct oval_generator *generator);		char *oval_generator_get_product_name(struct oval_generator *generator);
	char *oval_generator_get_product_version(struct oval_generator *generator);		char *oval_generator_get_product_version(struct oval_generator *generator);
	char *oval_generator_get_schema_version(struct oval_generator *generator);		char *oval_generator_get_schema_version(struct oval_generator *generator);
	char *oval_generator_get_timestamp(struct oval_generator *generator);		char *oval_generator_get_timestamp(struct oval_generator *generator);
	bool oval_generator_is_valid(struct oval_generator *generator);
	void oval_generator_set_product_name(struct oval_generator *generator, char *product_name);		void oval_generator_set_product_name(struct oval_generator *generator, char *product_name);
	void oval_generator_set_product_version(struct oval_generator *generator, c har *product_version);		void oval_generator_set_product_version(struct oval_generator *generator, c har *product_version);
	void oval_generator_set_schema_version(struct oval_generator *generator, ch ar *schema_version);		void oval_generator_set_schema_version(struct oval_generator *generator, ch ar *schema_version);
	void oval_generator_set_timestamp(struct oval_generator *generator, char *t imestamp);		void oval_generator_set_timestamp(struct oval_generator *generator, char *t imestamp);
	/**		/**
	* Create an empty oval_definition_model.		* Create an empty oval_definition_model.
	* @memberof oval_definition_model		* @memberof oval_definition_model
	*/		*/
	struct oval_definition_model *oval_definition_model_new(void);		struct oval_definition_model *oval_definition_model_new(void);
	skipping to change at line 630		skipping to change at line 631
	* @memberof oval_definition_model		* @memberof oval_definition_model
	*/		*/
	struct oval_definition_model *oval_definition_model_clone(struct oval_defin ition_model *);		struct oval_definition_model *oval_definition_model_clone(struct oval_defin ition_model *);
	/**		/**
	* Export an oval_definition_model into file.		* Export an oval_definition_model into file.
	* @memberof oval_definition_model		* @memberof oval_definition_model
	*		*
	*/		*/
	int oval_definition_model_export(struct oval_definition_model *, const char *file);		int oval_definition_model_export(struct oval_definition_model *, const char *file);
	/**		/**
	* Free OVAL object model.		* Free OVAL object model and all binded variable models.
	* @memberof oval_definition_model		* @memberof oval_definition_model
	*/		*/
	void oval_definition_model_free(struct oval_definition_model *model);		void oval_definition_model_free(struct oval_definition_model *model);
	/**		/**
	* @name Setters		* @name Setters
	* @{		* @{
	*/		*/
	void oval_definition_model_set_generator(struct oval_definition_model *mode l, struct oval_generator *generator);		void oval_definition_model_set_generator(struct oval_definition_model *mode l, struct oval_generator *generator);
	/**		/**
	* Bind an oval_variable_model to the specified oval_definition_model.		* Bind an oval_variable_model to the specified oval_definition_model.
	* @return zero on success or non zero value if an error occurred		* @return zero on success or non zero value if an error occurred
	* @memberof oval_definition_model		* @memberof oval_definition_model
	*/		*/
	int oval_definition_model_bind_variable_model(struct oval_definition_model *, struct oval_variable_model *);		int oval_definition_model_bind_variable_model(struct oval_definition_model *, struct oval_variable_model *);
	void oval_definition_model_clear_external_variables(struct oval_definition_ model *);		void oval_definition_model_clear_external_variables(struct oval_definition_ model *);
	/**
	* Lock the definition_model instance.
	* The state of a locked instance cannot be changed.
	* This operation has no effect if the model is already locked.
	* @memberof oval_definition_model
	*/
	void oval_definition_model_lock(struct oval_definition_model *definition_mo
	del);
	/** @} */		/** @} */
	/**		/**
	* @name Getters		* @name Getters
	* @{		* @{
	*/		*/
	struct oval_generator *oval_definition_model_get_generator(struct oval_defi nition_model *model);		struct oval_generator *oval_definition_model_get_generator(struct oval_defi nition_model *model);
	/**		/**
	* Returns the appended @ref oval_definition having the specified id.		* Returns the appended @ref oval_definition having the specified id.
	* IF the specified id does not resolve to an appended Oval_definition the method shall return NULL.		* IF the specified id does not resolve to an appended Oval_definition the method shall return NULL.
	skipping to change at line 739		skipping to change at line 733
	* @memberof oval_definition_model		* @memberof oval_definition_model
	*/		*/
	struct oval_state_iterator *oval_definition_model_get_states(struct oval_de finition_model *model);		struct oval_state_iterator *oval_definition_model_get_states(struct oval_de finition_model *model);
	/**		/**
	* Get OVAL variables.		* Get OVAL variables.
	* Return all oval_variables from the specified oval_definition_model.		* Return all oval_variables from the specified oval_definition_model.
	* @param model the queried model.		* @param model the queried model.
	* @memberof oval_definition_model		* @memberof oval_definition_model
	*/		*/
	struct oval_variable_iterator *oval_definition_model_get_variables(struct o val_definition_model *model);		struct oval_variable_iterator *oval_definition_model_get_variables(struct o val_definition_model *model);
	/**
	* Return <b>true</b> if the definition_model instance is locked.
	* The state of a locked instance cannot be changed.
	* @memberof oval_definition_model
	*/
	bool oval_definition_model_is_locked(struct oval_definition_model *definiti
	on_model);
	/**		/**
	* Get supported version of OVAL XML		* Get supported version of OVAL XML
	* @return version of XML file format		* @return version of XML file format
	* @memberof oval_definition_model		* @memberof oval_definition_model
	*/		*/
	const char * oval_definition_model_supported(void);		const char * oval_definition_model_supported(void);
			/**
			* Return the list of variable models bound to the specified oval_definitio
			n_model.
			* @return iterator over oval_variable_model collection
			* @memberof oval_definition_model
			*/
			struct oval_variable_model_iterator *oval_definition_model_get_variable_mod
			els(struct oval_definition_model *);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* Return <b>true</b> if the definition_model instance is valid
	* An oval_definition_model is valid if all the following are true
	* - All included definitions are valid
	* - All included tests are valid
	* - All included objects are valid
	* - All included states are valid
	* - All included variables are valid
	* @memberof oval_definition_model
	*/
	bool oval_definition_model_is_valid(struct oval_definition_model *definitio
	n_model);
	/** @} */		/** @} */
	/**		/**
	* Construct an instance of @ref oval_definition.		* Construct an instance of @ref oval_definition.
	* Initialized attribute values are		* Initialized attribute values are
	* - id bound to value specified by id parameter.		* - id bound to value specified by id parameter.
	* - version bound to 0.		* - version bound to 0.
	* - class bound to @ref OVAL_CLASS_UNKNOWN		* - class bound to @ref OVAL_CLASS_UNKNOWN
	* - deprecated bound to <b>false</b>		* - deprecated bound to <b>false</b>
	* - title bound to NULL		* - title bound to NULL
	skipping to change at line 964		skipping to change at line 948
	* All the child elements will be exported in the metadata of the definitio n.		* All the child elements will be exported in the metadata of the definitio n.
	* @memberof oval_definition		* @memberof oval_definition
	*/		*/
	xmlNode *oval_definition_get_metadata(struct oval_definition *);		xmlNode *oval_definition_get_metadata(struct oval_definition *);
	/**		/**
	* Returns attribute @ref oval_definition->criteria.		* Returns attribute @ref oval_definition->criteria.
	* @return A pointer to the criteria attribute of the specified @ref oval_d efinition.		* @return A pointer to the criteria attribute of the specified @ref oval_d efinition.
	* @memberof oval_definition		* @memberof oval_definition
	*/		*/
	struct oval_criteria_node *oval_definition_get_criteria(struct oval_definit ion *);		struct oval_criteria_node *oval_definition_get_criteria(struct oval_definit ion *);
	/**
	* return <b>true</b> if the definition instance is locked.
	* The state of a locked instance cannot be changed.
	* @memberof oval_definition
	*/
	bool oval_definition_is_locked(struct oval_definition *definition);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* Returns <b>true</b> if the @ref oval_definition is valid.
	* An Oval_definition is valid if all the following are true
	* - attribute criteria is bound to a valid instance of @ref Oval_crite
	ria.
	* @memberof oval_definition
	*/
	bool oval_definition_is_valid(struct oval_definition *definition);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* Returns <b>true</b> if the iterator contains more instances of @ref oval _definition.		* Returns <b>true</b> if the iterator contains more instances of @ref oval _definition.
	* @memberof oval_definition_iterator		* @memberof oval_definition_iterator
	*/		*/
	skipping to change at line 1193		skipping to change at line 1163
	* @memberof oval_test		* @memberof oval_test
	*/		*/
	struct oval_object *oval_test_get_object(struct oval_test *);		struct oval_object *oval_test_get_object(struct oval_test *);
	/**		/**
	* Returns attribute @ref oval_test->states.		* Returns attribute @ref oval_test->states.
	* @return A new iterator for the states attribute of the specified @ref ov al_test.		* @return A new iterator for the states attribute of the specified @ref ov al_test.
	* It should be freed after use by the calling application.		* It should be freed after use by the calling application.
	* @memberof oval_test		* @memberof oval_test
	*/		*/
	struct oval_state_iterator *oval_test_get_states(struct oval_test *);		struct oval_state_iterator *oval_test_get_states(struct oval_test *);
	/**
	* return <b>true</b> if the test instance is locked.
	* The state of a locked instance cannot be changed.
	* @memberof oval_test
	*/
	bool oval_test_is_locked(struct oval_test *test);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* Returns <b>true</b> if @ref oval_test is valid.
	* An Oval_test is valid if the test subtype is OVAL_INDEPENDENT_UNKNOWN
	* or if all of the following are true:
	* - The object attribute is valid
	* - If the state attribute is not NULL
	* - the state attribute is valid
	* @memberof oval_test
	*/
	bool oval_test_is_valid(struct oval_test *);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* Returns <b>true</b> if the iterator is not exhausted.		* Returns <b>true</b> if the iterator is not exhausted.
	* @memberof oval_test_iterator		* @memberof oval_test_iterator
	*/		*/
	skipping to change at line 1404		skipping to change at line 1358
	* @memberof oval_object		* @memberof oval_object
	*/		*/
	struct oval_object_content_iterator *oval_object_get_object_contents(struct oval_object *);		struct oval_object_content_iterator *oval_object_get_object_contents(struct oval_object *);
	/**		/**
	* Returns attribute @ref oval_object->behaviors.		* Returns attribute @ref oval_object->behaviors.
	* @return A new iterator for the behaviors attribute of the specified @ref oval_object.		* @return A new iterator for the behaviors attribute of the specified @ref oval_object.
	* It should be freed after use by the calling application.		* It should be freed after use by the calling application.
	* @memberof oval_object		* @memberof oval_object
	*/		*/
	struct oval_behavior_iterator *oval_object_get_behaviors(struct oval_object *);		struct oval_behavior_iterator *oval_object_get_behaviors(struct oval_object *);
	/**
	* return <b>true</b> if the object instance is locked.
	* The state of a locked instance cannot be changed.
	* @memberof oval_object
	*/
	bool oval_object_is_locked(struct oval_object *object);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* Return <b>true</b> if the object instance is valid.
	* An Oval_object is valid if all of the following are true
	* - All included object contents are valid
	* - All included behaviors are valid
	* @memberof oval_object
	*/
	bool oval_object_is_valid(struct oval_object *object);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* Returns <b>true</b> if the iterator is not exhausted.		* Returns <b>true</b> if the iterator is not exhausted.
	* @memberof oval_object_iterator		* @memberof oval_object_iterator
	*/		*/
	skipping to change at line 1599		skipping to change at line 1539
	* @memberof oval_state		* @memberof oval_state
	*/		*/
	int oval_state_get_operator(struct oval_state *);		int oval_state_get_operator(struct oval_state *);
	/**		/**
	* Returns attribute @ref oval_state->contents.		* Returns attribute @ref oval_state->contents.
	* @return A new iterator for the contents attribute of the specified @ref oval_state.		* @return A new iterator for the contents attribute of the specified @ref oval_state.
	* It should be freed after use by the calling application.		* It should be freed after use by the calling application.
	* @memberof oval_state		* @memberof oval_state
	*/		*/
	struct oval_state_content_iterator *oval_state_get_contents(struct oval_sta te *);		struct oval_state_content_iterator *oval_state_get_contents(struct oval_sta te *);
	/**
	* return <b>true</b> if the state instance is locked.
	* The state of a locked instance cannot be changed.
	* @memberof oval_state
	*/
	bool oval_state_is_locked(struct oval_state *state);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* Returns <b>true</b> if the iterator is not exhausted.		* Returns <b>true</b> if the iterator is not exhausted.
	* @memberof oval_state_iterator		* @memberof oval_state_iterator
	*/		*/
	skipping to change at line 1632		skipping to change at line 1566
	* Frees the iterator.		* Frees the iterator.
	* @memberof oval_state_iterator		* @memberof oval_state_iterator
	*/		*/
	void oval_state_iterator_free(struct oval_state_iterator *);		void oval_state_iterator_free(struct oval_state_iterator *);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* Return <b>true</b> if the state instance is valid
	* An Oval_state is valid if all of the following are true
	* - All included state contents are valid
	* @memberof oval_state
	*/
	bool oval_state_is_valid(struct oval_state *state);
	/** @} */		/** @} */
	/**		/**
	* Construct new instance of @ref oval_variable.		* Construct new instance of @ref oval_variable.
	* Attribute values shall be initialized:		* Attribute values shall be initialized:
	* - id -- initialized to a copy of the id parameter		* - id -- initialized to a copy of the id parameter
	* - type -- initialized to the type parameter		* - type -- initialized to the type parameter
	* - version -- initialized to zero		* - version -- initialized to zero
	* - deprecated -- initialized to <b>false</b>		* - deprecated -- initialized to <b>false</b>
	* - comment -- initialized to NULL		* - comment -- initialized to NULL
	skipping to change at line 1799		skipping to change at line 1726
	* If attribute type <> @ref OVAL_VARIABLE_LOCAL this method shall return N ULL.		* If attribute type <> @ref OVAL_VARIABLE_LOCAL this method shall return N ULL.
	* @return A pointer to the component attribute of the specified @ref oval_ variable.		* @return A pointer to the component attribute of the specified @ref oval_ variable.
	* @memberof oval_variable		* @memberof oval_variable
	*/		*/
	struct oval_component *oval_variable_get_component(struct oval_variable *); //type==OVAL_VARIABLE_LOCAL		struct oval_component *oval_variable_get_component(struct oval_variable *); //type==OVAL_VARIABLE_LOCAL
	/**		/**
	* Returns attribute @ref Oval_component_type->text.		* Returns attribute @ref Oval_component_type->text.
	* @memberof oval_variable		* @memberof oval_variable
	*/		*/
	const char *oval_component_type_get_text(oval_component_type_t type);		const char *oval_component_type_get_text(oval_component_type_t type);
	/**
	* return <b>true</b> if the variable instance is locked.
	* The state of a locked instance cannot be changed.
	* @memberof oval_variable
	*/
	bool oval_variable_is_locked(struct oval_variable *variable);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* Returns <b>true</b> if iterator not exhausted.		* Returns <b>true</b> if iterator not exhausted.
	* @memberof oval_variable_iterator		* @memberof oval_variable_iterator
	*/		*/
	skipping to change at line 1832		skipping to change at line 1753
	* Free iterator.		* Free iterator.
	* @memberof oval_variable_iterator		* @memberof oval_variable_iterator
	*/		*/
	void oval_variable_iterator_free(struct oval_variable_iterator *);		void oval_variable_iterator_free(struct oval_variable_iterator *);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* Returns <b>true</b> if @ref oval_variable is valid.
	* An oval_variable is valid if all of the following are true:
	* - The value of the id attribute is matched by the regular expression
	<b>^oval:[\.A-Za-z0-9_\-]+:var:[1-9][0-9]*$</b>
	* - The value of the type attribute is not @ref OVAL_VARIABLE_UNKNOWN
	* - The value of the version attribute is a positive integer
	* - The value of the datatype attribute is not @ref OVAL_DATATYPE_UNKN
	OWN
	* - If type == @ref OVAL_VARIABLE_CONSTANT
	* - At least one Oval_value is appended to the values attribut
	e.
	* - If type == @ref OVAL_VARIABLE_LOCAL
	* - The component attribute is not NULL.
	* - The bound Oval_component is valid (@ref oval_component_is_
	valid).
	* @memberof oval_variable
	*/
	bool oval_variable_is_valid(struct oval_variable *);
	/** @} */		/** @} */
	/**		/**
	* Construct instance of @ref oval_affected.		* Construct instance of @ref oval_affected.
	* @memberof oval_affected		* @memberof oval_affected
	*/		*/
	struct oval_affected *oval_affected_new(struct oval_definition_model *);		struct oval_affected *oval_affected_new(struct oval_definition_model *);
	/**		/**
	* Clone instance of @ref oval_affected.		* Clone instance of @ref oval_affected.
	* @return A copy of the specified @ref oval_affected.		* @return A copy of the specified @ref oval_affected.
	skipping to change at line 1914		skipping to change at line 1820
	*/		*/
	struct oval_string_iterator *oval_affected_get_platforms(struct oval_affect ed *);		struct oval_string_iterator *oval_affected_get_platforms(struct oval_affect ed *);
	/**		/**
	* Get member values @ref oval_affected product_names.		* Get member values @ref oval_affected product_names.
	* If the returned iterator is empty, then the associated Oval_definition i s not constrained to a specific product choice.		* If the returned iterator is empty, then the associated Oval_definition i s not constrained to a specific product choice.
	* @return A new iterator for the products attribute of the specified @ref oval_affected.		* @return A new iterator for the products attribute of the specified @ref oval_affected.
	* It should be freed after use by the calling application.		* It should be freed after use by the calling application.
	* @memberof oval_affected		* @memberof oval_affected
	*/		*/
	struct oval_string_iterator *oval_affected_get_products(struct oval_affecte d *);		struct oval_string_iterator *oval_affected_get_products(struct oval_affecte d *);
	/**
	* Return <b>true</b> if the instance of oval_affected is locked.
	* The state of a locked instance cannot be changed.
	* @memberof oval_affected
	*/
	bool oval_affected_is_locked(struct oval_affected *);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* Returns <b>true</b>
	* @memberof oval_affected
	*/
	bool oval_affected_is_valid(struct oval_affected *);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* Return <b>true</b> if iterator has more @ref oval_affected.		* Return <b>true</b> if iterator has more @ref oval_affected.
	* @memberof oval_affected_iterator		* @memberof oval_affected_iterator
	*/		*/
	skipping to change at line 2011		skipping to change at line 1906
	* @return A pointer to the id attribute of the specified @ref oval_referen ce.		* @return A pointer to the id attribute of the specified @ref oval_referen ce.
	* @memberof oval_reference		* @memberof oval_reference
	*/		*/
	char *oval_reference_get_id(struct oval_reference *);		char *oval_reference_get_id(struct oval_reference *);
	/**		/**
	* Get OVAL reference URL.		* Get OVAL reference URL.
	* @return A pointer to the url attribute of the specified @ref oval_refere nce.		* @return A pointer to the url attribute of the specified @ref oval_refere nce.
	* @memberof oval_reference		* @memberof oval_reference
	*/		*/
	char *oval_reference_get_url(struct oval_reference *);		char *oval_reference_get_url(struct oval_reference *);
	/**
	* return <b>true</b> if the reference instance is locked.
	* The state of a locked instance cannot be changed.
	* @memberof oval_reference
	*/
	bool oval_reference_is_locked(struct oval_reference *reference);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* @memberof oval_reference_iterator		* @memberof oval_reference_iterator
	*/		*/
	bool oval_reference_iterator_has_more(struct oval_reference_iterator *);		bool oval_reference_iterator_has_more(struct oval_reference_iterator *);
	skipping to change at line 2041		skipping to change at line 1930
	/**		/**
	* @memberof oval_reference_iterator		* @memberof oval_reference_iterator
	*/		*/
	void oval_reference_iterator_free(struct oval_reference_iterator *);		void oval_reference_iterator_free(struct oval_reference_iterator *);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* return <b>true</b> if the reference instance is valid
	* @memberof oval_reference
	*/
	bool oval_reference_is_valid(struct oval_reference *reference);
	/** @} */		/** @} */
	/**		/**
	* Construct an instance of @ref oval_criteria_node.		* Construct an instance of @ref oval_criteria_node.
	* Initialized attribute values are:		* Initialized attribute values are:
	* - type initialized to value of type parameter.		* - type initialized to value of type parameter.
	* - negate -- initialized to <b>false</b>		* - negate -- initialized to <b>false</b>
	* - comment -- initialized to NULL		* - comment -- initialized to NULL
	* - If type == @ref OVAL_NODETYPE_CRITERIA (@ref Oval_criteria ):		* - If type == @ref OVAL_NODETYPE_CRITERIA (@ref Oval_criteria ):
	* - operator -- initialized to @ref OVAL_OPERATOR_UNKN OWN		* - operator -- initialized to @ref OVAL_OPERATOR_UNKN OWN
	skipping to change at line 2189		skipping to change at line 2073
	* @memberof oval_criteria_node		* @memberof oval_criteria_node
	*/		*/
	struct oval_test *oval_criteria_node_get_test(struct oval_criteria_node *);		struct oval_test *oval_criteria_node_get_test(struct oval_criteria_node *);
	/**		/**
	* Returns attribute @ref Oval_extends->definition.		* Returns attribute @ref Oval_extends->definition.
	* If Oval_criteria_node->type <> @ref OVAL_NODETYPE_EXTENDDEF, this method shall return NULL.		* If Oval_criteria_node->type <> @ref OVAL_NODETYPE_EXTENDDEF, this method shall return NULL.
	* @return A pointer to the definition attribute of the specified @ref oval _criteria_node.		* @return A pointer to the definition attribute of the specified @ref oval _criteria_node.
	* @memberof oval_criteria_node		* @memberof oval_criteria_node
	*/		*/
	struct oval_definition *oval_criteria_node_get_definition(struct oval_crite ria_node *);		struct oval_definition *oval_criteria_node_get_definition(struct oval_crite ria_node *);
	/**
	* Return <b>true</b> if the instance of Oval_criteria_node is locked.
	* The state of a locked instance cannot be changed.
	* @memberof oval_criteria_node
	*/
	bool oval_criteria_node_is_locked(struct oval_criteria_node *);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* Returns <b>true</b> if the iterator is not exhausted.		* Returns <b>true</b> if the iterator is not exhausted.
	* @memberof oval_criteria_node_iterator		* @memberof oval_criteria_node_iterator
	*/		*/
	skipping to change at line 2223		skipping to change at line 2101
	* Free the iterator.		* Free the iterator.
	* @memberof oval_criteria_node_iterator		* @memberof oval_criteria_node_iterator
	*/		*/
	void oval_criteria_node_iterator_free(struct oval_criteria_node_iterator *) ;		void oval_criteria_node_iterator_free(struct oval_criteria_node_iterator *) ;
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* Returns <b>true</b> if @ref Oval_criteria_node is valid.
	* An Oval_criteria_node is valid if one of the following is true:
	* - The type attribute is @ref OVAL_NODETYPE_CRITERIA (@ref Oval_crite
	ria)-- AND
	* - The subnode attribute is not an empty iterator -- AND
	* - Each iterated Oval_criteria_node is valid.
	* - The type attribute is @ref OVAL_NODETYPE_CRITERION (@ref Oval_crit
	erion) -- AND
	* - The referenced test is valid.
	* - The type attribute is @ref OVAL_NODETYPE_EXTENDDEF (@ref Oval_exte
	nds) -- AND
	* - The referenced definition is valid.
	* @memberof oval_criteria_node
	*/
	bool oval_criteria_node_is_valid(struct oval_criteria_node *);
	/** @} */		/** @} */
	/**		/**
	* @memberof oval_object_content		* @memberof oval_object_content
	*/		*/
	struct oval_object_content *oval_object_content_new(struct oval_definition_ model *model, oval_object_content_type_t type);		struct oval_object_content *oval_object_content_new(struct oval_definition_ model *model, oval_object_content_type_t type);
	/**		/**
	* @return A copy of the specified @ref oval_object_content.		* @return A copy of the specified @ref oval_object_content.
	* @memberof oval_object_content		* @memberof oval_object_content
	skipping to change at line 2314		skipping to change at line 2179
	* Get varCheck of a simple object content.		* Get varCheck of a simple object content.
	* @memberof oval_object_content		* @memberof oval_object_content
	*/		*/
	oval_check_t oval_object_content_get_varCheck(struct oval_object_content *) ; //type == OVAL_OBJECTCONTENT_ENTITY		oval_check_t oval_object_content_get_varCheck(struct oval_object_content *) ; //type == OVAL_OBJECTCONTENT_ENTITY
	/**		/**
	* Get setobject of a set object content.		* Get setobject of a set object content.
	* @return A pointer to the set attribute of the specified @ref oval_object _content.		* @return A pointer to the set attribute of the specified @ref oval_object _content.
	* @memberof oval_object_content		* @memberof oval_object_content
	*/		*/
	struct oval_setobject *oval_object_content_get_setobject(struct oval_object _content *); //type == OVAL_OBJECTCONTENT_SET		struct oval_setobject *oval_object_content_get_setobject(struct oval_object _content *); //type == OVAL_OBJECTCONTENT_SET
	/**
	* return <b>true</b> if the object_content instance is locked.
	* The state of a locked instance cannot be changed.
	* @memberof oval_object_content
	*/
	bool oval_object_content_is_locked(struct oval_object_content *object_conte
	nt);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* @memberof oval_object_content_iterator		* @memberof oval_object_content_iterator
	*/		*/
	bool oval_object_content_iterator_has_more(struct oval_object_content_itera tor *);		bool oval_object_content_iterator_has_more(struct oval_object_content_itera tor *);
	skipping to change at line 2344		skipping to change at line 2203
	/**		/**
	* @memberof oval_object_content_iterator		* @memberof oval_object_content_iterator
	*/		*/
	void oval_object_content_iterator_free(struct oval_object_content_iterator *);		void oval_object_content_iterator_free(struct oval_object_content_iterator *);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* Return <b>true</b> if the object_content instance is valid
	* An Oval_object_content is valid if one of the following is true:
	* - The type attribute is @ref OVAL_OBJECTCONTENT_ENTITY -- AND
	* - The @ref oval_entity is valid.
	* - The type attribute is @ref OVAL_OBJECTCONTENT_SET -- AND
	* - The @ref oval_setobject is valid.
	* @memberof oval_object_content
	*/
	bool oval_object_content_is_valid(struct oval_object_content *object_conten
	t);
	/** @} */		/** @} */
	/**		/**
	* @memberof oval_behavior		* @memberof oval_behavior
	*/		*/
	struct oval_behavior *oval_behavior_new(struct oval_definition_model *);		struct oval_behavior *oval_behavior_new(struct oval_definition_model *);
	/**		/**
	* @return A copy of the specified @ref oval_behavior.		* @return A copy of the specified @ref oval_behavior.
	* @memberof oval_behavior		* @memberof oval_behavior
	skipping to change at line 2397		skipping to change at line 2246
	* @return A pointer to the key attribute of the specified @ref oval_behavi or.		* @return A pointer to the key attribute of the specified @ref oval_behavi or.
	* @memberof oval_behavior		* @memberof oval_behavior
	*/		*/
	char *oval_behavior_get_key(struct oval_behavior *);		char *oval_behavior_get_key(struct oval_behavior *);
	/**		/**
	* Get OVAL behavior value.		* Get OVAL behavior value.
	* @return A pointer to the value attribute of the specified @ref oval_beha vior.		* @return A pointer to the value attribute of the specified @ref oval_beha vior.
	* @memberof oval_behavior		* @memberof oval_behavior
	*/		*/
	char *oval_behavior_get_value(struct oval_behavior *);		char *oval_behavior_get_value(struct oval_behavior *);
	/**
	* return <b>true</b> if the behavior instance is locked.
	* The state of a locked instance cannot be changed.
	* @memberof oval_behavior
	*/
	bool oval_behavior_is_locked(struct oval_behavior *behavior);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* @memberof oval_behavior_iterator		* @memberof oval_behavior_iterator
	*/		*/
	bool oval_behavior_iterator_has_more(struct oval_behavior_iterator *);		bool oval_behavior_iterator_has_more(struct oval_behavior_iterator *);
	skipping to change at line 2427		skipping to change at line 2270
	/**		/**
	* @memberof oval_behavior_iterator		* @memberof oval_behavior_iterator
	*/		*/
	void oval_behavior_iterator_free(struct oval_behavior_iterator *);		void oval_behavior_iterator_free(struct oval_behavior_iterator *);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* @memberof oval_behavior
	* Return <b>true</b> if the behavior instance is valid
	*/
	bool oval_behavior_is_valid(struct oval_behavior *behavior);
	/** @} */		/** @} */
	/**		/**
	* @memberof oval_state_content		* @memberof oval_state_content
	*/		*/
	struct oval_state_content *oval_state_content_new(struct oval_definition_mo del *);		struct oval_state_content *oval_state_content_new(struct oval_definition_mo del *);
	/**		/**
	* @return A copy of the specified @ref oval_state_content.		* @return A copy of the specified @ref oval_state_content.
	* @memberof oval_state_content		* @memberof oval_state_content
	*/		*/
	skipping to change at line 2494		skipping to change at line 2332
	/**		/**
	* Get multipe variable values processing of a state content.		* Get multipe variable values processing of a state content.
	* @memberof oval_state_content		* @memberof oval_state_content
	*/		*/
	oval_check_t oval_state_content_get_var_check(struct oval_state_content *);		oval_check_t oval_state_content_get_var_check(struct oval_state_content *);
	/**		/**
	* Get multipe entities processing of a state content.		* Get multipe entities processing of a state content.
	* @memberof oval_state_content		* @memberof oval_state_content
	*/		*/
	oval_check_t oval_state_content_get_ent_check(struct oval_state_content *);		oval_check_t oval_state_content_get_ent_check(struct oval_state_content *);
	/**
	* Return <b>true</b> if the setobject instance is locked.
	* The state of a locked instance cannot be changed.
	* @memberof oval_state_content
	*/
	bool oval_state_content_is_locked(struct oval_state_content *);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* @ingroup oval_state_content_iterators		* @ingroup oval_state_content_iterators
	* @memberof oval_state_content_iterator		* @memberof oval_state_content_iterator
	*/		*/
	skipping to change at line 2569		skipping to change at line 2401
	bool oval_value_get_boolean(struct oval_value *); //datatype==OVAL_DAT ATYPE_BOOLEAN		bool oval_value_get_boolean(struct oval_value *); //datatype==OVAL_DAT ATYPE_BOOLEAN
	/**		/**
	* Get OVAL value as a floating point number.		* Get OVAL value as a floating point number.
	* @memberof oval_value		* @memberof oval_value
	*/		*/
	float oval_value_get_float(struct oval_value *); //datatype==OVAL_DAT ATYPE_FLOAT		float oval_value_get_float(struct oval_value *); //datatype==OVAL_DAT ATYPE_FLOAT
	/**		/**
	* Get OVAL value as an integer.		* Get OVAL value as an integer.
	* @memberof oval_value		* @memberof oval_value
	*/		*/
	long oval_value_get_integer(struct oval_value *); //datatype==OVAL_DAT		long long oval_value_get_integer(struct oval_value *); //datatype==OVAL_DAT
	ATYPE_INTEGER		ATYPE_INTEGER
	/**
	* return <b>true</b> if the value instance is locked.
	* The state of a locked instance cannot be changed.
	* @memberof oval_value
	*/
	bool oval_value_is_locked(struct oval_value *value);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* @memberof oval_value_iterator		* @memberof oval_value_iterator
	*/		*/
	bool oval_value_iterator_has_more(struct oval_value_iterator *);		bool oval_value_iterator_has_more(struct oval_value_iterator *);
	skipping to change at line 2604		skipping to change at line 2430
	/**		/**
	* @memberof oval_value_iterator		* @memberof oval_value_iterator
	*/		*/
	void oval_value_iterator_free(struct oval_value_iterator *);		void oval_value_iterator_free(struct oval_value_iterator *);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* Return <b>true</b> if the value instance is valid
	* @memberof oval_value
	*/
	bool oval_value_is_valid(struct oval_value *value);
	/** @} */		/** @} */
	/**		/**
	* @memberof oval_entity		* @memberof oval_entity
	*/		*/
	struct oval_entity *oval_entity_new(struct oval_definition_model *);		struct oval_entity *oval_entity_new(struct oval_definition_model *);
	/**		/**
	* @return A copy of the specified @ref oval_entity.		* @return A copy of the specified @ref oval_entity.
	* @memberof oval_entity		* @memberof oval_entity
	*/		*/
	skipping to change at line 2710		skipping to change at line 2531
	/**		/**
	* Get OVAL entity mask.		* Get OVAL entity mask.
	* @memberof oval_entity		* @memberof oval_entity
	*/		*/
	int oval_entity_get_mask(struct oval_entity *);		int oval_entity_get_mask(struct oval_entity *);
	/**		/**
	* Get OVAL entity varref type.		* Get OVAL entity varref type.
	* @memberof oval_entity		* @memberof oval_entity
	*/		*/
	oval_entity_varref_type_t oval_entity_get_varref_type(struct oval_entity *) ;		oval_entity_varref_type_t oval_entity_get_varref_type(struct oval_entity *) ;
	/**
	* return <b>true</b> if the entity instance is locked.
	* The state of a locked instance cannot be changed.
	* @memberof oval_entity
	*/
	bool oval_entity_is_locked(struct oval_entity *entity);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* @memberof oval_entity_iterator		* @memberof oval_entity_iterator
	*/		*/
	bool oval_entity_iterator_has_more(struct oval_entity_iterator *);		bool oval_entity_iterator_has_more(struct oval_entity_iterator *);
	skipping to change at line 2740		skipping to change at line 2555
	/**		/**
	* @memberof oval_entity_iterator		* @memberof oval_entity_iterator
	*/		*/
	void oval_entity_iterator_free(struct oval_entity_iterator *);		void oval_entity_iterator_free(struct oval_entity_iterator *);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* Return <b>true</b> if the entity instance is valid
	* @memberof oval_entity
	*/
	bool oval_entity_is_valid(struct oval_entity *entity);
	/** @} */		/** @} */
	/**		/**
	* @memberof oval_record_field		* @memberof oval_record_field
	*/		*/
	struct oval_record_field *oval_record_field_new(oval_record_field_type_t);		struct oval_record_field *oval_record_field_new(oval_record_field_type_t);
	/**		/**
	* @memberof oval_record_field		* @memberof oval_record_field
	*/		*/
	struct oval_record_field *oval_record_field_clone(struct oval_record_field *);		struct oval_record_field *oval_record_field_clone(struct oval_record_field *);
	skipping to change at line 2862		skipping to change at line 2672
	/**		/**
	* @memberof oval_record_field		* @memberof oval_record_field
	*/		*/
	void oval_record_field_iterator_free(struct oval_record_field_iterator *);		void oval_record_field_iterator_free(struct oval_record_field_iterator *);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	bool oval_record_field_is_valid(struct oval_record_field *);
	/** @} */		/** @} */
	/**		/**
	* @memberof oval_filter		* @memberof oval_filter
	*/		*/
	struct oval_filter *oval_filter_new(struct oval_definition_model *);		struct oval_filter *oval_filter_new(struct oval_definition_model *);
	/**		/**
	* @memberof oval_filter		* @memberof oval_filter
	*/		*/
	void oval_filter_free(struct oval_filter *);		void oval_filter_free(struct oval_filter *);
	skipping to change at line 2899		skipping to change at line 2708
	void oval_filter_set_filter_action(struct oval_filter *, oval_filter_action _t );		void oval_filter_set_filter_action(struct oval_filter *, oval_filter_action _t );
	/** @} */		/** @} */
	/**		/**
	* @name Getters		* @name Getters
	* @{		* @{
	*/		*/
	/**		/**
	* @memberof oval_filter		* @memberof oval_filter
	*/		*/
	bool oval_filter_is_locked(struct oval_filter *);
	/**
	* @memberof oval_filter
	*/
	struct oval_state *oval_filter_get_state(struct oval_filter *);		struct oval_state *oval_filter_get_state(struct oval_filter *);
	/**		/**
	* @memberof oval_filter		* @memberof oval_filter
	*/		*/
	oval_filter_action_t oval_filter_get_filter_action(struct oval_filter *);		oval_filter_action_t oval_filter_get_filter_action(struct oval_filter *);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	skipping to change at line 2932		skipping to change at line 2737
	/**		/**
	* @memberof oval_filter		* @memberof oval_filter
	*/		*/
	void oval_filter_iterator_free(struct oval_filter_iterator *);		void oval_filter_iterator_free(struct oval_filter_iterator *);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* @memberof oval_filter
	*/
	bool oval_filter_is_valid(struct oval_filter *);
	/** @} */		/** @} */
	/**		/**
	* @memberof oval_setobject		* @memberof oval_setobject
	*/		*/
	struct oval_setobject *oval_setobject_new(struct oval_definition_model *);		struct oval_setobject *oval_setobject_new(struct oval_definition_model *);
	/**		/**
	* @return A copy of the specified @ref oval_setobject.		* @return A copy of the specified @ref oval_setobject.
	* @memberof oval_setobject		* @memberof oval_setobject
	*/		*/
	skipping to change at line 3015		skipping to change at line 2816
	*/		*/
	struct oval_object_iterator *oval_setobject_get_objects(struct oval_setobje ct *); //type==OVAL_SET_COLLECTIVE;		struct oval_object_iterator *oval_setobject_get_objects(struct oval_setobje ct *); //type==OVAL_SET_COLLECTIVE;
	/**		/**
	* Get OVAL set object filters.		* Get OVAL set object filters.
	* This works only with sets of OVAL_SET_COLLECTIVE type.		* This works only with sets of OVAL_SET_COLLECTIVE type.
	* @return A new iterator for the filters attribute of the specified @ref o val_setobject.		* @return A new iterator for the filters attribute of the specified @ref o val_setobject.
	* It should be freed after use by the calling application.		* It should be freed after use by the calling application.
	* @memberof oval_setobject		* @memberof oval_setobject
	*/		*/
	struct oval_filter_iterator *oval_setobject_get_filters(struct oval_setobje ct *); //type==OVAL_SET_COLLECTIVE;		struct oval_filter_iterator *oval_setobject_get_filters(struct oval_setobje ct *); //type==OVAL_SET_COLLECTIVE;
	/**
	* return <b>true</b> if the setobject instance is locked.
	* The state of a locked instance cannot be changed.
	* @memberof oval_setobject
	*/
	bool oval_setobject_is_locked(struct oval_setobject *setobject);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* @memberof oval_setobject_iterator		* @memberof oval_setobject_iterator
	*/		*/
	bool oval_setobject_iterator_has_more(struct oval_setobject_iterator *);		bool oval_setobject_iterator_has_more(struct oval_setobject_iterator *);
	skipping to change at line 3045		skipping to change at line 2840
	/**		/**
	* @memberof oval_setobject_iterator		* @memberof oval_setobject_iterator
	*/		*/
	void oval_setobject_iterator_free(struct oval_setobject_iterator *);		void oval_setobject_iterator_free(struct oval_setobject_iterator *);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* Return <b>true</b> if the setobject instance is valid
	* An Oval_setobject is valid if one of the following is true:
	* - The type attribute is @ref OVAL_SET_AGGREGATE -- AND
	* - The subsets attribute is not an empty iterator -- AND
	* - Each iterated oval_setobject is valid.
	* - The type attribute is @ref OVAL_SET_COLLECTIVE -- AND
	* - The objects attribute is not an empty iterator -- AND
	* - Each iterated oval_object is valid.
	* - The filters attribute is not an empty iterator -- AND
	* - Each iterated oval_state is valid.
	* @memberof oval_setobject
	*/
	bool oval_setobject_is_valid(struct oval_setobject *setobject);
	/** @} */		/** @} */
	/**		/**
	* Construct new intance of @ref Oval_component.		* Construct new intance of @ref Oval_component.
	* Attribute values shall be initialized:		* Attribute values shall be initialized:
	* - type -- initialized to the value of the type parameter.		* - type -- initialized to the value of the type parameter.
	* - If type == @ref OVAL_FUNCTION_CONCAT		* - If type == @ref OVAL_FUNCTION_CONCAT
	* - components -- initialized to empty iterator		* - components -- initialized to empty iterator
	* - If type == @ref OVAL_FUNCTION_ESCAPE_REGEX		* - If type == @ref OVAL_FUNCTION_ESCAPE_REGEX
	* - components -- initialized to empty iterator		* - components -- initialized to empty iterator
	skipping to change at line 3310		skipping to change at line 3091
	*/		*/
	char *oval_component_get_regex_pattern(struct oval_component *); //ty pe==OVAL_COMPONENT_REGEX_CAPTURE		char *oval_component_get_regex_pattern(struct oval_component *); //ty pe==OVAL_COMPONENT_REGEX_CAPTURE
	/**		/**
	* Returns attribute @ref Oval_literal->literal.		* Returns attribute @ref Oval_literal->literal.
	* IF component->type <> @ref OVAL_COMPONENT_LITERAL, this method shall ret urn NULL		* IF component->type <> @ref OVAL_COMPONENT_LITERAL, this method shall ret urn NULL
	* @return A pointer to the value attribute of the specified @ref oval_comp onent.		* @return A pointer to the value attribute of the specified @ref oval_comp onent.
	* @note applications should not free the @ref Oval_value returned by this method		* @note applications should not free the @ref Oval_value returned by this method
	* @memberof oval_component		* @memberof oval_component
	*/		*/
	struct oval_value *oval_component_get_literal_value(struct oval_component * ); //type==OVAL_COMPONENT_LITERAL		struct oval_value *oval_component_get_literal_value(struct oval_component * ); //type==OVAL_COMPONENT_LITERAL
	/**
	* return <b>true</b> if the component instance is locked.
	* The state of a locked instance cannot be changed.
	* @memberof oval_component
	*/
	bool oval_component_is_locked(struct oval_component *component);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* Return <b>true</b> if the iterator is not exhausted.		* Return <b>true</b> if the iterator is not exhausted.
	* @memberof oval_component_iterator		* @memberof oval_component_iterator
	*/		*/
	skipping to change at line 3349		skipping to change at line 3124
	* How many remains.		* How many remains.
	* @memberof oval_component_iterator		* @memberof oval_component_iterator
	*/		*/
	int oval_component_iterator_remaining(struct oval_component_iterator *);		int oval_component_iterator_remaining(struct oval_component_iterator *);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* Returns <b>true</b> if the @ref Oval_component is valid.
	* An Oval_component is valid if one of the following is true:
	* - type == @ref OVAL_FUNCTION_CONCAT <b>AND</b>
	* components.length > 0 <b>AND</b>
	* all appended components are valid
	* - type == @ref OVAL_FUNCTION_ARITHMETIC <b>AND</b>
	* arithmetic_operation <> @ref OVAL_ARITHMETIC_UNKNOWN <b>AN
	D</b>
	* components.length at least 2 <b>AND</b>
	* all appended components are valid
	* - type == @ref OVAL_FUNCTION_BEGIN <b>AND</b>
	* prefix <> NULL AMD
	* components.length == 1 <b>AND</b>
	* the appended component is valid
	* - type == @ref OVAL_FUNCTION_END <b>AND</b>
	* suffix <> NULL
	* components.length == 1 <b>AND</b>
	* the appended component is valid
	* - type == @ref OVAL_FUNCTION_SPLIT <b>AND</b>
	* delimiter <> NULL
	* components.length == 1 <b>AND</b>
	* the appended component is valid
	* - type == @ref OVAL_FUNCTION_SUBSTRING <b>AND</b>
	* start > 0 <b>AND</b> length > 0
	* components.length == 1 <b>AND</b>
	* the appended component is valid
	* - type == @ref OVAL_FUNCTION_TIMEDIF <b>AND</b>
	* timedif_format_1 <> OVAL_DATETIME_FORMAT_UNKNOWN <b>AND</b
	>
	* components.length > 0 <b>AND</b>
	* all appended components are valid <b>AND</b>
	* <b>IF</b> timedif_format_2 <> OVAL_DATETIME_FORMAT_UNKNOWN
	<b>THEN</b>
	* components.length is divisible by 2
	* - type == @ref OVAL_FUNCTION_REGEX_CAPTURE <b>AND</b>
	* pattern <> NULL
	* components.length == 1 <b>AND</b>
	* the appended component is valid
	* - type == @ref OVAL_FUNCTION_ESCAPE_REGEX <b>AND</b>
	* components.length == 1 <b>AND</b>
	* the appended component is valid
	* - type == @ref OVAL_COMPONENT_LITERAL <b>AND</b>
	* literal <> NULL
	* - type == @ref OVAL_COMPONENT_OBJECTREF
	* object <> NULL <b>AND</b> object is a valid Oval_object <b
	>AND</b>
	* object_field <> NULL
	* - type == @ref OVAL_COMPONENT_VARREF
	* variable <> NULL <b>AND</b> variable is a valid Oval_varia
	ble
	* @memberof oval_component
	*/
	bool oval_component_is_valid(struct oval_component *);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* Returns <b>true</b> if the iterator is not exhausted.		* Returns <b>true</b> if the iterator is not exhausted.
	* @memberof oval_string_iterator		* @memberof oval_string_iterator
	*/		*/
End of changes. 40 change blocks.
	305 lines changed or deleted		15 lines changed or added

	oval_probe.h		oval_probe.h
	skipping to change at line 66		skipping to change at line 66
	int oval_probe_query_sysinfo(oval_probe_session_t *sess, struct oval_sysinf o **out_sysinfo) __attribute__ ((nonnull(1, 2)));		int oval_probe_query_sysinfo(oval_probe_session_t *sess, struct oval_sysinf o **out_sysinfo) __attribute__ ((nonnull(1, 2)));
	/**		/**
	* Evaluate an object		* Evaluate an object
	* @param sess probe session		* @param sess probe session
	* @param object the object to evaluate		* @param object the object to evaluate
	*/		*/
	int oval_probe_query_object(oval_probe_session_t *psess, struct oval_object *object, int flags, struct oval_syschar **out_syschar) __attribute__ ((non null(1, 2)));		int oval_probe_query_object(oval_probe_session_t *psess, struct oval_object *object, int flags, struct oval_syschar **out_syschar) __attribute__ ((non null(1, 2)));
	/**		/**
	* Probe all objects and update system characteristic model in the session
	* @param sess probe session
	* @return 0 on success
	*/
	int oval_probe_query_objects(oval_probe_session_t *sess) __attribute__ ((no
	nnull(1)));
	/**
	* Probe objects required for the evalatuation of the specified definition and update the system characteristics model associated with the session		* Probe objects required for the evalatuation of the specified definition and update the system characteristics model associated with the session
	* @param sess probe session		* @param sess probe session
	* @param id definition id		* @param id definition id
	* @return 0 on success		* @return 0 on success
	*/		*/
	int oval_probe_query_definition(oval_probe_session_t *sess, const char *id) __attribute__ ((nonnull(1, 2)));		int oval_probe_query_definition(oval_probe_session_t *sess, const char *id) __attribute__ ((nonnull(1, 2)));
	/**		/**
	* Query the specified variable and all its dependencies in order to comput e the vector of its values		* Query the specified variable and all its dependencies in order to comput e the vector of its values
	* @param sess probe session		* @param sess probe session
End of changes. 1 change blocks.
	8 lines changed or deleted		0 lines changed or added

	oval_results.h		oval_results.h
	skipping to change at line 189		skipping to change at line 189
	* @param file filename		* @param file filename
	* @memberof oval_results_model		* @memberof oval_results_model
	*/		*/
	int oval_results_model_export(struct oval_results_model *, struct oval_resu lt_directives *, const char *file);		int oval_results_model_export(struct oval_results_model *, struct oval_resu lt_directives *, const char *file);
	/**		/**
	* @name Setters		* @name Setters
	* @{		* @{
	*/		*/
	void oval_results_model_set_generator(struct oval_results_model *model, str uct oval_generator *generator);		void oval_results_model_set_generator(struct oval_results_model *model, str uct oval_generator *generator);
	/**
	* Lock the result_model instance.
	* The state of a locked instance cannot be changed.
	* This operation has no effect if the model is already locked.
	* @memberof oval_results_model
	*/
	void oval_results_model_lock(struct oval_results_model *result_model);
	/** @} */		/** @} */
	/**		/**
	* @name Getters		* @name Getters
	* @{		* @{
	*/		*/
	struct oval_generator *oval_results_model_get_generator(struct oval_results _model *model);		struct oval_generator *oval_results_model_get_generator(struct oval_results _model *model);
	/**		/**
	* Return bound definition model from an oval_results_model.		* Return bound definition model from an oval_results_model.
	* @param model the specified oval_results_model.		* @param model the specified oval_results_model.
	* @memberof oval_results_model		* @memberof oval_results_model
	*/		*/
	struct oval_definition_model *oval_results_model_get_definition_model(struc t oval_results_model *model);		struct oval_definition_model *oval_results_model_get_definition_model(struc t oval_results_model *model);
	/**		/**
	* Return iterator over reporting systems.		* Return iterator over reporting systems.
	* @param model the specified results model		* @param model the specified results model
	* @memberof oval_results_model		* @memberof oval_results_model
	*/		*/
	struct oval_result_system_iterator *oval_results_model_get_systems(struct o val_results_model *);		struct oval_result_system_iterator *oval_results_model_get_systems(struct o val_results_model *);
	/**
	* @memberof oval_results_model
	*/
	bool oval_results_model_is_locked(struct oval_results_model *result_model);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**		/**
	* Evaluate all result_systems. It's assumed that all necessary system		* Evaluate all result_systems. It's assumed that all necessary system
	* characteristics for evaluation were altready gathered.		* characteristics for evaluation were altready gathered.
	* @return 0 on sucess and -1 on fail. Use \ref ERRORS mechanism to examine the error.		* @return 0 on sucess and -1 on fail. Use \ref ERRORS mechanism to examine the error.
	*/		*/
	int oval_results_model_eval(struct oval_results_model *);		int oval_results_model_eval(struct oval_results_model *);
	/**
	* Return <b>true</b> if the results_model instance is valid
	* An oval_results_model is valid if all the following are true
	* - The associated oval_definition_model is valid
	* - The systems attribute is not an empty iterator and
	* each iterated oval_result_system is valid.
	* @memberof oval_results_model
	*/
	bool oval_results_model_is_valid(struct oval_results_model *results_model);
	/** @} */		/** @} */
	/**		/**
	* @memberof oval_result_system		* @memberof oval_result_system
	*/		*/
	struct oval_result_system *oval_result_system_new(struct oval_results_model *, struct oval_syschar_model *);		struct oval_result_system *oval_result_system_new(struct oval_results_model *, struct oval_syschar_model *);
	/**		/**
	* @return A copy of the specified @ref oval_result_system.		* @return A copy of the specified @ref oval_result_system.
	* @memberof oval_result_system		* @memberof oval_result_system
	*/		*/
	skipping to change at line 300		skipping to change at line 280
	*/		*/
	struct oval_result_test_iterator *oval_result_system_get_tests(struct oval_ result_system *);		struct oval_result_test_iterator *oval_result_system_get_tests(struct oval_ result_system *);
	/**		/**
	* @memberof oval_result_system		* @memberof oval_result_system
	*/		*/
	struct oval_syschar_model *oval_result_system_get_syschar_model(struct oval _result_system *);		struct oval_syschar_model *oval_result_system_get_syschar_model(struct oval _result_system *);
	/**		/**
	* @memberof oval_result_system		* @memberof oval_result_system
	*/		*/
	struct oval_sysinfo *oval_result_system_get_sysinfo(struct oval_result_syst em *);		struct oval_sysinfo *oval_result_system_get_sysinfo(struct oval_result_syst em *);
	/**
	* @memberof oval_result_system
	*/
	bool oval_result_system_is_locked(struct oval_result_system *result_system)
	;
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* @memberof oval_result_system_iterator		* @memberof oval_result_system_iterator
	*/		*/
	bool oval_result_system_iterator_has_more(struct oval_result_system_iterato r *);		bool oval_result_system_iterator_has_more(struct oval_result_system_iterato r *);
	skipping to change at line 342		skipping to change at line 318
	* @param sys is result_system from result_model		* @param sys is result_system from result_model
	* @return 0 on sucess and -1 on fail. Use \ref ERRORS mechanism to examine the error.		* @return 0 on sucess and -1 on fail. Use \ref ERRORS mechanism to examine the error.
	*/		*/
	int oval_result_system_eval(struct oval_result_system *sys);		int oval_result_system_eval(struct oval_result_system *sys);
	/**		/**
	* Function evaluates specified OVAL definition in result_system. It assume s that all necessary system		* Function evaluates specified OVAL definition in result_system. It assume s that all necessary system
	* characteristics for evaluation were altready gathered.		* characteristics for evaluation were altready gathered.
	* @memberof oval_result_system		* @memberof oval_result_system
	* @param sys is result_system from result_model		* @param sys is result_system from result_model
	* @param id of the definition from definition_model from result_model		* @param id of the definition from definition_model from result_model
	* @return OVAL_RESULT_ERROR if there was a problem in evaluation. Use \ref		* @return 0 on succeess, or non 0 if an error occurred. Use \ref ERRORS me
	ERRORS mechanism to examine the error. Otherwise one of valid		chanism to examine the error.
	* values for the evaluation of an OVAL Definitions is returned.
	*/
	oval_result_t oval_result_system_eval_definition(struct oval_result_system
	*sys, const char *id);
	/**
	* Return <b>true</b> if the result_system instance is valid
	* An oval_result_system is valid if all the following are true
	* - The associated oval_syschar_model is valid
	* - All included result definitions are valid
	* - All included result tests are valid
	* @memberof oval_result_system
	*/		*/
	bool oval_result_system_is_valid(struct oval_result_system *result_system);		int oval_result_system_eval_definition(struct oval_result_system *sys, cons t char *id);
	/** @} */		/** @} */
	/**		/**
	* @memberof oval_result_definition		* @memberof oval_result_definition
	*/		*/
	struct oval_result_definition *oval_result_definition_new(struct oval_resul t_system *, char *);		struct oval_result_definition *oval_result_definition_new(struct oval_resul t_system *, char *);
	/**		/**
	* @return A copy of the specified @ref oval_result_definition.		* @return A copy of the specified @ref oval_result_definition.
	* @memberof oval_result_definition		* @memberof oval_result_definition
	*/		*/
	skipping to change at line 426		skipping to change at line 392
	*/		*/
	oval_result_t oval_result_definition_get_result(struct oval_result_definiti on *);		oval_result_t oval_result_definition_get_result(struct oval_result_definiti on *);
	/**		/**
	* @memberof oval_result_definition		* @memberof oval_result_definition
	*/		*/
	struct oval_message_iterator *oval_result_definition_get_messages(struct ov al_result_definition *);		struct oval_message_iterator *oval_result_definition_get_messages(struct ov al_result_definition *);
	/**		/**
	* @memberof oval_result_definition		* @memberof oval_result_definition
	*/		*/
	struct oval_result_criteria_node *oval_result_definition_get_criteria(struc t oval_result_definition *);		struct oval_result_criteria_node *oval_result_definition_get_criteria(struc t oval_result_definition *);
	/**
	* @memberof oval_result_definition
	*/
	bool oval_result_definition_is_locked(struct oval_result_definition *result
	_definition);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* @memberof oval_result_definition_iterator		* @memberof oval_result_definition_iterator
	*/		*/
	bool oval_result_definition_iterator_has_more(struct oval_result_definition _iterator *);		bool oval_result_definition_iterator_has_more(struct oval_result_definition _iterator *);
	skipping to change at line 454		skipping to change at line 416
	/**		/**
	* @memberof oval_result_definition_iterator		* @memberof oval_result_definition_iterator
	*/		*/
	void oval_result_definition_iterator_free(struct oval_result_definition_ite rator *);		void oval_result_definition_iterator_free(struct oval_result_definition_ite rator *);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* Return <b>true</b> if the result_definition instance is valid
	* An oval_result_definition is valid if all the following are true
	* - The system attribute is non-NULL
	* - The associated oval_definition is valid
	* - All included result criteria nodes are valid
	* @memberof oval_result_definition
	*/
	bool oval_result_definition_is_valid(struct oval_result_definition *result_
	definition);
	/** @} */		/** @} */
	/**		/**
	* @memberof oval_result_test		* @memberof oval_result_test
	*/		*/
	struct oval_result_test *oval_result_test_new(struct oval_result_system *, char *);		struct oval_result_test *oval_result_test_new(struct oval_result_system *, char *);
	/**		/**
	* @return A copy of the specified @ref oval_result_test.		* @return A copy of the specified @ref oval_result_test.
	* @memberof oval_result_test		* @memberof oval_result_test
	*/		*/
	skipping to change at line 542		skipping to change at line 495
	*/		*/
	struct oval_message_iterator *oval_result_test_get_messages(struct oval_res ult_test *);		struct oval_message_iterator *oval_result_test_get_messages(struct oval_res ult_test *);
	/**		/**
	* @memberof oval_result_test		* @memberof oval_result_test
	*/		*/
	struct oval_result_item_iterator *oval_result_test_get_items(struct oval_re sult_test *);		struct oval_result_item_iterator *oval_result_test_get_items(struct oval_re sult_test *);
	/**		/**
	* @memberof oval_result_test		* @memberof oval_result_test
	*/		*/
	struct oval_variable_binding_iterator *oval_result_test_get_bindings(struct oval_result_test *);		struct oval_variable_binding_iterator *oval_result_test_get_bindings(struct oval_result_test *);
	/**
	* Return <b>true</b> if the result_test instance is locked.
	* The state of a locked instance cannot be changed.
	*/
	bool oval_result_test_is_locked(struct oval_result_test *result_test);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* @memberof oval_result_test_iterator		* @memberof oval_result_test_iterator
	*/		*/
	bool oval_result_test_iterator_has_more(struct oval_result_test_iterator *) ;		bool oval_result_test_iterator_has_more(struct oval_result_test_iterator *) ;
	skipping to change at line 571		skipping to change at line 519
	/**		/**
	* @memberof oval_result_test_iterator		* @memberof oval_result_test_iterator
	*/		*/
	void oval_result_test_iterator_free(struct oval_result_test_iterator *);		void oval_result_test_iterator_free(struct oval_result_test_iterator *);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* Return <b>true</b> if the result_test instance is valid
	* An oval_result_test is valid if all the following are true
	* - The associated oval_test is valid
	* - All included result items are valid
	* - All included variable bindings are valid
	* @memberof oval_result_test
	*/
	bool oval_result_test_is_valid(struct oval_result_test *result_test);
	/** @} */		/** @} */
	/**		/**
	* @memberof oval_result_item		* @memberof oval_result_item
	*/		*/
	struct oval_result_item *oval_result_item_new(struct oval_result_system *, char *);		struct oval_result_item *oval_result_item_new(struct oval_result_system *, char *);
	/**		/**
	* @return A copy of the specified @ref oval_result_item.		* @return A copy of the specified @ref oval_result_item.
	* @memberof oval_result_item		* @memberof oval_result_item
	*/		*/
	skipping to change at line 627		skipping to change at line 566
	*/		*/
	struct oval_sysitem *oval_result_item_get_sysitem(struct oval_result_item * );		struct oval_sysitem *oval_result_item_get_sysitem(struct oval_result_item * );
	/**		/**
	* @memberof oval_result_item		* @memberof oval_result_item
	*/		*/
	oval_result_t oval_result_item_get_result(struct oval_result_item *);		oval_result_t oval_result_item_get_result(struct oval_result_item *);
	/**		/**
	* @memberof oval_result_item		* @memberof oval_result_item
	*/		*/
	struct oval_message_iterator *oval_result_item_get_messages(struct oval_res ult_item *);		struct oval_message_iterator *oval_result_item_get_messages(struct oval_res ult_item *);
	/**
	* @memberof oval_result_item
	*/
	bool oval_result_item_is_locked(struct oval_result_item *result_item);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* @memberof oval_result_item_iterator		* @memberof oval_result_item_iterator
	*/		*/
	bool oval_result_item_iterator_has_more(struct oval_result_item_iterator *) ;		bool oval_result_item_iterator_has_more(struct oval_result_item_iterator *) ;
	skipping to change at line 655		skipping to change at line 590
	/**		/**
	* @memberof oval_result_item_iterator		* @memberof oval_result_item_iterator
	*/		*/
	void oval_result_item_iterator_free(struct oval_result_item_iterator *);		void oval_result_item_iterator_free(struct oval_result_item_iterator *);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* Return <b>true</b> if the result_item instance is valid
	* An oval_result_item is valid if all the following are true
	* - The sysitem attribute is a valid oval_sysitem
	* @memberof oval_result_item
	*/
	bool oval_result_item_is_valid(struct oval_result_item *result_item);
	/** @} */		/** @} */
	/**		/**
	* @memberof oval_result_criteria_node		* @memberof oval_result_criteria_node
	*/		*/
	struct oval_result_criteria_node *oval_result_criteria_node_new(struct oval _result_system *, oval_criteria_node_type_t,		struct oval_result_criteria_node *oval_result_criteria_node_new(struct oval _result_system *, oval_criteria_node_type_t,
	int, ...);		int, ...);
	/**		/**
	* @return A copy of the specified @ref oval_result_criteria_node.		* @return A copy of the specified @ref oval_result_criteria_node.
	* @memberof oval_result_criteria_node		* @memberof oval_result_criteria_node
	skipping to change at line 745		skipping to change at line 673
	*/		*/
	struct oval_result_criteria_node_iterator *oval_result_criteria_node_get_su bnodes(struct oval_result_criteria_node *); //type==NODETYPE_CRITERIA		struct oval_result_criteria_node_iterator *oval_result_criteria_node_get_su bnodes(struct oval_result_criteria_node *); //type==NODETYPE_CRITERIA
	/**		/**
	* @memberof oval_result_criteria_node		* @memberof oval_result_criteria_node
	*/		*/
	struct oval_result_test *oval_result_criteria_node_get_test(struct oval_res ult_criteria_node *); //type==NODETYPE_CRITERION		struct oval_result_test *oval_result_criteria_node_get_test(struct oval_res ult_criteria_node *); //type==NODETYPE_CRITERION
	/**		/**
	* @memberof oval_result_criteria_node		* @memberof oval_result_criteria_node
	*/		*/
	struct oval_result_definition *oval_result_criteria_node_get_extends(struct oval_result_criteria_node *); //type==NODETYPE_EXTENDDEF		struct oval_result_definition *oval_result_criteria_node_get_extends(struct oval_result_criteria_node *); //type==NODETYPE_EXTENDDEF
	/**
	* @memberof oval_result_criteria_node
	*/
	bool oval_result_criteria_node_is_locked(struct oval_result_criteria_node *
	result_criteria_node);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* @memberof oval_result_criteria_node_iterator		* @memberof oval_result_criteria_node_iterator
	*/		*/
	bool oval_result_criteria_node_iterator_has_more(struct oval_result_criteri a_node_iterator *);		bool oval_result_criteria_node_iterator_has_more(struct oval_result_criteri a_node_iterator *);
	skipping to change at line 773		skipping to change at line 697
	/**		/**
	* @memberof oval_result_criteria_node_iterator		* @memberof oval_result_criteria_node_iterator
	*/		*/
	void oval_result_criteria_node_iterator_free(struct oval_result_criteria_no de_iterator *);		void oval_result_criteria_node_iterator_free(struct oval_result_criteria_no de_iterator *);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* Returns <b>true</b> if @ref Oval_result_criteria_node is valid.
	* An Oval_result_criteria_node is valid if one of the following is true:
	* - The type attribute is @ref OVAL_NODETYPE_CRITERIA -- AND
	* - The subnode attribute is not an empty iterator -- AND
	* - Each iterated Oval_result_criteria_node is valid.
	* - The type attribute is @ref OVAL_NODETYPE_CRITERION -- AND
	* - The referenced result test is valid.
	* - The type attribute is @ref OVAL_NODETYPE_EXTENDDEF -- AND
	* - The referenced result definition is valid.
	* @memberof oval_result_criteria_node
	*/
	bool oval_result_criteria_node_is_valid(struct oval_result_criteria_node *r
	esult_criteria_node);
	/** @} */		/** @} */
	/**		/**
	* Create new OVAL Results Directives instance. Directives are setup NOT to report any type of result by default.		* Create new OVAL Results Directives instance. Directives are setup NOT to report any type of result by default.
	* @memberof oval_result_directives		* @memberof oval_result_directives
	*/		*/
	struct oval_result_directives *oval_result_directives_new(struct oval_resul ts_model *);		struct oval_result_directives *oval_result_directives_new(struct oval_resul ts_model *);
	/**		/**
	* @memberof oval_result_directives		* @memberof oval_result_directives
	*/		*/
	skipping to change at line 826		skipping to change at line 737
	* @{		* @{
	*/		*/
	/**		/**
	* @memberof oval_result_directives		* @memberof oval_result_directives
	*/		*/
	bool oval_result_directives_get_reported(struct oval_result_directives *, o val_result_t);		bool oval_result_directives_get_reported(struct oval_result_directives *, o val_result_t);
	/**		/**
	* @memberof oval_result_directives		* @memberof oval_result_directives
	*/		*/
	oval_result_directive_content_t oval_result_directives_get_content(struct o val_result_directives *, oval_result_t);		oval_result_directive_content_t oval_result_directives_get_content(struct o val_result_directives *, oval_result_t);
	/**
	* @memberof oval_result_directives
	*/
	bool oval_result_directives_is_locked(struct oval_result_directives *result
	_directives);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* @memberof oval_result_directives
	*/
	bool oval_result_directives_is_valid(struct oval_result_directives *result_
	directives);
	/** @} */		/** @} */
	/** @} */		/** @} */
	/**		/**
	* @}END OVALRES		* @}END OVALRES
	* @}END OVAL		* @}END OVAL
	*/		*/
	#endif /* OVAL_RESULTS_H_ */		#endif /* OVAL_RESULTS_H_ */
End of changes. 16 change blocks.
	108 lines changed or deleted		3 lines changed or added

	oval_system_characteristics.h		oval_system_characteristics.h
	skipping to change at line 154		skipping to change at line 154
	* @see: oval_syschar_get_sysitem		* @see: oval_syschar_get_sysitem
	*/		*/
	struct oval_sysitem_iterator;		struct oval_sysitem_iterator;
	/**		/**
	* @struct oval_sysent		* @struct oval_sysent
	*/		*/
	struct oval_sysent;		struct oval_sysent;
	/**		/**
	* @struct oval_sysent_iterator		* @struct oval_sysent_iterator
	* @see: oval_sysitem_get_items		* @see: oval_sysitem_get_sysents
	*/		*/
	struct oval_sysent_iterator;		struct oval_sysent_iterator;
	/**		/**
	* @struct oval_message		* @struct oval_message
	* OVAL message		* OVAL message
	*/		*/
	struct oval_message;		struct oval_message;
	/**		/**
	* @struct oval_message_iterator		* @struct oval_message_iterator
	skipping to change at line 191		skipping to change at line 191
	* @param definition_model the specified oval_definition_model.		* @param definition_model the specified oval_definition_model.
	* @memberof oval_syschar_model		* @memberof oval_syschar_model
	*/		*/
	struct oval_syschar_model *oval_syschar_model_new(struct oval_definition_mo del *definition_model);		struct oval_syschar_model *oval_syschar_model_new(struct oval_definition_mo del *definition_model);
	/**		/**
	* Import the content from the file into an oval_syschar_model.		* Import the content from the file into an oval_syschar_model.
	* If imported content specifies a model entity that is already registered within the model its content is overwritten.		* If imported content specifies a model entity that is already registered within the model its content is overwritten.
	* @param model the merge target model		* @param model the merge target model
	* @param file filename		* @param file filename
	* @return -1 if an error occurred		* @return zero on success or non zero value if an error occurred
	* @memberof oval_syschar_model		* @memberof oval_syschar_model
	*/		*/
	int oval_syschar_model_import(struct oval_syschar_model *model, const char *file);		int oval_syschar_model_import(struct oval_syschar_model *model, const char *file);
	/**		/**
	* Copy an oval_syschar_model.		* Copy an oval_syschar_model.
	* @return A copy of the specified @ref oval_syschar_model.		* @return A copy of the specified @ref oval_syschar_model.
	* @memberof oval_syschar_model		* @memberof oval_syschar_model
	*/		*/
	struct oval_syschar_model *oval_syschar_model_clone(struct oval_syschar_mod el *);		struct oval_syschar_model *oval_syschar_model_clone(struct oval_syschar_mod el *);
	/**		/**
	skipping to change at line 228		skipping to change at line 228
	/**		/**
	* Bind a variable model to the definitions bound to the syschar model.		* Bind a variable model to the definitions bound to the syschar model.
	* @return zero on success or non zero value if an error occurred		* @return zero on success or non zero value if an error occurred
	* @memberof oval_syschar_model		* @memberof oval_syschar_model
	*/		*/
	int oval_syschar_model_bind_variable_model(struct oval_syschar_model *, str uct oval_variable_model *);		int oval_syschar_model_bind_variable_model(struct oval_syschar_model *, str uct oval_variable_model *);
	/**		/**
	* @memberof oval_syschar_model		* @memberof oval_syschar_model
	*/		*/
	void oval_syschar_model_set_sysinfo(struct oval_syschar_model *model, struc t oval_sysinfo *sysinfo);		void oval_syschar_model_set_sysinfo(struct oval_syschar_model *model, struc t oval_sysinfo *sysinfo);
	/**
	* @memberof oval_syschar_model
	*/
	void oval_syschar_model_add_variable_binding(struct oval_syschar_model *mod
	el, struct oval_variable_binding *binding);
	/**
	* Lock the syschar_model instance.
	* The state of a locked instance cannot be changed.
	* This operation has no effect if the model is already locked.
	* @memberof oval_syschar_model
	*/
	void oval_syschar_model_lock(struct oval_syschar_model *syschar_model);
	/** @} */		/** @} */
	/**		/**
	* @name Getters		* @name Getters
	* @{		* @{
	*/		*/
	struct oval_generator *oval_syschar_model_get_generator(struct oval_syschar _model *model);		struct oval_generator *oval_syschar_model_get_generator(struct oval_syschar _model *model);
	/**		/**
	* Return related oval_definition_model from an oval_syschar_model.		* Return related oval_definition_model from an oval_syschar_model.
	* @param model the specified oval_syschar_model.		* @param model the specified oval_syschar_model.
	skipping to change at line 282		skipping to change at line 271
	/**		/**
	* Get the oval_values bound to a specified variable.		* Get the oval_values bound to a specified variable.
	* @memberof oval_syschar_model		* @memberof oval_syschar_model
	*/		*/
	int oval_syschar_model_compute_variable(struct oval_syschar_model *, struct oval_variable *);		int oval_syschar_model_compute_variable(struct oval_syschar_model *, struct oval_variable *);
	oval_syschar_collection_flag_t oval_variable_get_collection_flag(struct ova l_variable *);		oval_syschar_collection_flag_t oval_variable_get_collection_flag(struct ova l_variable *);
	/**		/**
	* @memberof oval_syschar_model		* @memberof oval_syschar_model
	*/		*/
	struct oval_sysitem *oval_syschar_model_get_sysitem(struct oval_syschar_mod el *, const char *);		struct oval_sysitem *oval_syschar_model_get_sysitem(struct oval_syschar_mod el *, const char *);
	/**
	* Return <b>true</b> if the syschar_model instance is locked.
	* The state of a locked instance cannot be changed.
	* @memberof oval_syschar_model
	*/
	bool oval_syschar_model_is_locked(struct oval_syschar_model *syschar_model)
	;
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* Return <b>true</b> if the syschar_model instance is valid
	* An oval_syschar_model is valid if all the following are true
	* - The sysinfo attribute is valid
	* - The associated oval_definition_model is valid
	* - All included syschars are valid
	* - All included variable_bindings are valid
	* @memberof oval_syschar_model
	*/
	bool oval_syschar_model_is_valid(struct oval_syschar_model *syschar_model);
	/** @} */		/** @} */
	/**		/**
	* @memberof oval_sysinfo		* @memberof oval_sysinfo
	*/		*/
	struct oval_sysinfo *oval_sysinfo_new(struct oval_syschar_model *);		struct oval_sysinfo *oval_sysinfo_new(struct oval_syschar_model *);
	/**		/**
	* @return A copy of the specified @ref oval_sysinfo.		* @return A copy of the specified @ref oval_sysinfo.
	* @memberof oval_sysinfo		* @memberof oval_sysinfo
	*/		*/
	skipping to change at line 379		skipping to change at line 352
	* Get primary host name of the tested machine.		* Get primary host name of the tested machine.
	* @memberof oval_sysinfo		* @memberof oval_sysinfo
	*/		*/
	char *oval_sysinfo_get_primary_host_name(struct oval_sysinfo *);		char *oval_sysinfo_get_primary_host_name(struct oval_sysinfo *);
	/**		/**
	* Get an iterator to the list of network interfaces.		* Get an iterator to the list of network interfaces.
	* @memberof oval_sysinfo		* @memberof oval_sysinfo
	*/		*/
	struct oval_sysint_iterator *oval_sysinfo_get_interfaces(struct oval_sysinf o *);		struct oval_sysint_iterator *oval_sysinfo_get_interfaces(struct oval_sysinf o *);
	/**
	* Return <b>true</b> if the sysinfo instance is locked.
	* The state of a locked instance cannot be changed.
	* @memberof oval_sysinfo
	*/
	bool oval_sysinfo_is_locked(struct oval_sysinfo *sysinfo);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* @memberof oval_sysinfo_iterator		* @memberof oval_sysinfo_iterator
	*/		*/
	bool oval_sysinfo_iterator_has_more(struct oval_sysinfo_iterator *);		bool oval_sysinfo_iterator_has_more(struct oval_sysinfo_iterator *);
	skipping to change at line 409		skipping to change at line 376
	/**		/**
	* @memberof oval_sysinfo_iterator		* @memberof oval_sysinfo_iterator
	*/		*/
	void oval_sysinfo_iterator_free(struct oval_sysinfo_iterator *);		void oval_sysinfo_iterator_free(struct oval_sysinfo_iterator *);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* Return <b>true</b> if the sysinfo instance is valid
	* @memberof oval_sysinfo
	*/
	bool oval_sysinfo_is_valid(struct oval_sysinfo *sysinfo);
	/** @} */		/** @} */
	/**		/**
	* @memberof oval_syschar		* @memberof oval_syschar
	*/		*/
	struct oval_syschar *oval_syschar_new(struct oval_syschar_model *, struct o val_object *);		struct oval_syschar *oval_syschar_new(struct oval_syschar_model *, struct o val_object *);
	/**		/**
	* @return A copy of the specified @ref oval_syschar.		* @return A copy of the specified @ref oval_syschar.
	* @memberof oval_syschar		* @memberof oval_syschar
	*/		*/
	skipping to change at line 493		skipping to change at line 455
	* Get system characteristic variable bindings.		* Get system characteristic variable bindings.
	* @memberof oval_syschar		* @memberof oval_syschar
	*/		*/
	struct oval_variable_binding_iterator *oval_syschar_get_variable_bindings(s truct oval_syschar *);		struct oval_variable_binding_iterator *oval_syschar_get_variable_bindings(s truct oval_syschar *);
	/**		/**
	* Get system characteristic data.		* Get system characteristic data.
	* @memberof oval_syschar		* @memberof oval_syschar
	*/		*/
	struct oval_sysitem_iterator *oval_syschar_get_sysitem(struct oval_syschar *);		struct oval_sysitem_iterator *oval_syschar_get_sysitem(struct oval_syschar *);
	/**
	* Return <b>true</b> if the syschar instance is locked.
	* The state of a locked instance cannot be changed.
	* @memberof oval_syschar
	*/
	bool oval_syschar_is_locked(struct oval_syschar *syschar);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* @memberof oval_syschar_iterator		* @memberof oval_syschar_iterator
	*/		*/
	bool oval_syschar_iterator_has_more(struct oval_syschar_iterator *);		bool oval_syschar_iterator_has_more(struct oval_syschar_iterator *);
	skipping to change at line 523		skipping to change at line 479
	/**		/**
	* @memberof oval_syschar_iterator		* @memberof oval_syschar_iterator
	*/		*/
	void oval_syschar_iterator_free(struct oval_syschar_iterator *);		void oval_syschar_iterator_free(struct oval_syschar_iterator *);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* Return <b>true</b> if the syschar instance is valid
	* An oval_syschar is valid if all the following are true
	* - The object attribute is valid
	* - All included variable_bindings are valid
	* - All included sysitem are valid
	* @memberof oval_syschar
	*/
	bool oval_syschar_is_valid(struct oval_syschar *syschar);
	/** @} */		/** @} */
	/**		/**
	* @memberof oval_sysint		* @memberof oval_sysint
	*/		*/
	struct oval_sysint *oval_sysint_new(struct oval_syschar_model *);		struct oval_sysint *oval_sysint_new(struct oval_syschar_model *);
	/**		/**
	* @return A copy of the specified @ref oval_sysint.		* @return A copy of the specified @ref oval_sysint.
	* @memberof oval_sysint		* @memberof oval_sysint
	*/		*/
	skipping to change at line 587		skipping to change at line 534
	* Get interface IP address.		* Get interface IP address.
	* @memberof oval_sysint		* @memberof oval_sysint
	*/		*/
	char *oval_sysint_get_ip_address(struct oval_sysint *);		char *oval_sysint_get_ip_address(struct oval_sysint *);
	/**		/**
	* Get interface MAC address.		* Get interface MAC address.
	* @memberof oval_sysint		* @memberof oval_sysint
	*/		*/
	char *oval_sysint_get_mac_address(struct oval_sysint *);		char *oval_sysint_get_mac_address(struct oval_sysint *);
	/**
	* Return <b>true</b> if the sysint instance is locked.
	* The state of a locked instance cannot be changed.
	* @memberof oval_sysint
	*/
	bool oval_sysint_is_locked(struct oval_sysint *sysint);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* @memberof oval_sysint_iterator		* @memberof oval_sysint_iterator
	*/		*/
	bool oval_sysint_iterator_has_more(struct oval_sysint_iterator *);		bool oval_sysint_iterator_has_more(struct oval_sysint_iterator *);
	skipping to change at line 617		skipping to change at line 558
	/**		/**
	* @memberof oval_sysint_iterator		* @memberof oval_sysint_iterator
	*/		*/
	void oval_sysint_iterator_free(struct oval_sysint_iterator *);		void oval_sysint_iterator_free(struct oval_sysint_iterator *);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* Return <b>true</b> if the sysint instance is valid
	* @memberof oval_sysint
	*/
	bool oval_sysint_is_valid(struct oval_sysint *sysint);
	/** @} */		/** @} */
	/**		/**
	* @memberof oval_sysitem		* @memberof oval_sysitem
	*/		*/
	struct oval_sysitem *oval_sysitem_new(struct oval_syschar_model *, const ch ar *id);		struct oval_sysitem *oval_sysitem_new(struct oval_syschar_model *, const ch ar *id);
	/**		/**
	* @return A copy of the specified @ref oval_sysitem.		* @return A copy of the specified @ref oval_sysitem.
	* @memberof oval_sysitem		* @memberof oval_sysitem
	*/		*/
	skipping to change at line 657		skipping to change at line 593
	* @memberof oval_sysitem		* @memberof oval_sysitem
	*/		*/
	void oval_sysitem_set_subtype(struct oval_sysitem *sysitem, oval_subtype_t subtype);		void oval_sysitem_set_subtype(struct oval_sysitem *sysitem, oval_subtype_t subtype);
	/**		/**
	* @memberof oval_sysitem		* @memberof oval_sysitem
	*/		*/
	void oval_sysitem_add_message(struct oval_sysitem *, struct oval_message *) ;		void oval_sysitem_add_message(struct oval_sysitem *, struct oval_message *) ;
	/**		/**
	* @memberof oval_sysitem		* @memberof oval_sysitem
	*/		*/
	void oval_sysitem_add_item(struct oval_sysitem *, struct oval_sysent *);		void oval_sysitem_add_sysent(struct oval_sysitem *, struct oval_sysent *);
	/** @} */		/** @} */
	/**		/**
	* @name Getters		* @name Getters
	* @{		* @{
	*/		*/
	/**		/**
	* Get system data ID.		* Get system data ID.
	* @memberof oval_sysitem		* @memberof oval_sysitem
	*/		*/
	char *oval_sysitem_get_id(struct oval_sysitem *);		char *oval_sysitem_get_id(struct oval_sysitem *);
	/**		/**
	* Get system data status.		* Get system data status.
	* @memberof oval_sysitem		* @memberof oval_sysitem
	*/		*/
	oval_syschar_status_t oval_sysitem_get_status(struct oval_sysitem *);		oval_syschar_status_t oval_sysitem_get_status(struct oval_sysitem *);
	/**		/**
	* Get system data individual items.		* Get system data individual items.
	* @memberof oval_sysitem		* @memberof oval_sysitem
	*/		*/
	struct oval_sysent_iterator *oval_sysitem_get_items(struct oval_sysitem *);		struct oval_sysent_iterator *oval_sysitem_get_sysents(struct oval_sysitem * );
	/**		/**
	* Get system data message.		* Get system data message.
	* @memberof oval_sysitem		* @memberof oval_sysitem
	*/		*/
	struct oval_message_iterator *oval_sysitem_get_messages(struct oval_sysitem *);		struct oval_message_iterator *oval_sysitem_get_messages(struct oval_sysitem *);
	/**		/**
	* Get system data subtype.		* Get system data subtype.
	* @memberof oval_sysitem		* @memberof oval_sysitem
	*/		*/
	oval_subtype_t oval_sysitem_get_subtype(struct oval_sysitem *);		oval_subtype_t oval_sysitem_get_subtype(struct oval_sysitem *);
	/**
	* Return <b>true</b> if the sysitem instance is locked.
	* The state of a locked instance cannot be changed.
	* @memberof oval_sysitem
	*/
	bool oval_sysitem_is_locked(struct oval_sysitem *sysitem);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* @memberof oval_sysitem_iterator		* @memberof oval_sysitem_iterator
	*/		*/
	bool oval_sysitem_iterator_has_more(struct oval_sysitem_iterator *);		bool oval_sysitem_iterator_has_more(struct oval_sysitem_iterator *);
	skipping to change at line 719		skipping to change at line 649
	/**		/**
	* @memberof oval_sysitem_iterator		* @memberof oval_sysitem_iterator
	*/		*/
	void oval_sysitem_iterator_free(struct oval_sysitem_iterator *);		void oval_sysitem_iterator_free(struct oval_sysitem_iterator *);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* Return <b>true</b> if the sysitem instance is valid
	* An oval_sysitem is valid if all the following are true
	* - All included sysents are valid
	* @memberof oval_sysitem
	*/
	bool oval_sysitem_is_valid(struct oval_sysitem *sysitem);
	/** @} */		/** @} */
	/**		/**
	* @memberof oval_sysent		* @memberof oval_sysent
	*/		*/
	struct oval_sysent *oval_sysent_new(struct oval_syschar_model *);		struct oval_sysent *oval_sysent_new(struct oval_syschar_model *);
	/**		/**
	* @return A copy of the specified @ref oval_sysent.		* @return A copy of the specified @ref oval_sysent.
	* @memberof oval_sysent		* @memberof oval_sysent
	*/		*/
	skipping to change at line 809		skipping to change at line 732
	* Get system data item data type.		* Get system data item data type.
	* @memberof oval_sysent		* @memberof oval_sysent
	*/		*/
	oval_datatype_t oval_sysent_get_datatype(struct oval_sysent *);		oval_datatype_t oval_sysent_get_datatype(struct oval_sysent *);
	/**		/**
	* Get system data item mask.		* Get system data item mask.
	* @memberof oval_sysent		* @memberof oval_sysent
	*/		*/
	int oval_sysent_get_mask(struct oval_sysent *);		int oval_sysent_get_mask(struct oval_sysent *);
	/**
	* Return <b>true</b> if the sysent instance is locked.
	* The state of a locked instance cannot be changed.
	* @memberof oval_sysent
	*/
	bool oval_sysent_is_locked(struct oval_sysent *sysent);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* @memberof oval_sysent_iterator		* @memberof oval_sysent_iterator
	*/		*/
	bool oval_sysent_iterator_has_more(struct oval_sysent_iterator *);		bool oval_sysent_iterator_has_more(struct oval_sysent_iterator *);
	skipping to change at line 839		skipping to change at line 756
	/**		/**
	* @memberof oval_sysent_iterator		* @memberof oval_sysent_iterator
	*/		*/
	void oval_sysent_iterator_free(struct oval_sysent_iterator *);		void oval_sysent_iterator_free(struct oval_sysent_iterator *);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* Return <b>true</b> if the sysent instance is valid
	* @memberof oval_sysent
	*/
	bool oval_sysent_is_valid(struct oval_sysent *sysent);
	/** @} */		/** @} */
	/**		/**
	* @name Setters		* @name Setters
	* @{		* @{
	*/		*/
	/**		/**
	* @memberof oval_record_field		* @memberof oval_record_field
	*/		*/
	void oval_record_field_set_status(struct oval_record_field *, oval_syschar_ status_t);		void oval_record_field_set_status(struct oval_record_field *, oval_syschar_ status_t);
	skipping to change at line 907		skipping to change at line 819
	/**		/**
	* Get OVAL message text.		* Get OVAL message text.
	* @memberof oval_message		* @memberof oval_message
	*/		*/
	char *oval_message_get_text(struct oval_message *message);		char *oval_message_get_text(struct oval_message *message);
	/**		/**
	* Get OVAL message level.		* Get OVAL message level.
	* @memberof oval_message		* @memberof oval_message
	*/		*/
	oval_message_level_t oval_message_get_level(struct oval_message *message);		oval_message_level_t oval_message_get_level(struct oval_message *message);
	/**
	* return <b>true</b> if the message instance is locked.
	* The state of a locked instance cannot be changed.
	* @memberof oval_message
	*/
	bool oval_message_is_locked(struct oval_message *message);
	/** @} */		/** @} */
	/**		/**
	* @name Iterators		* @name Iterators
	* @{		* @{
	*/		*/
	/**		/**
	* @memberof oval_message_iterator		* @memberof oval_message_iterator
	*/		*/
	bool oval_message_iterator_has_more(struct oval_message_iterator *oc_messag e);		bool oval_message_iterator_has_more(struct oval_message_iterator *oc_messag e);
	skipping to change at line 934		skipping to change at line 840
	* @memberof oval_message_iterator		* @memberof oval_message_iterator
	*/		*/
	struct oval_message *oval_message_iterator_next(struct oval_message_iterato r *oc_message);		struct oval_message *oval_message_iterator_next(struct oval_message_iterato r *oc_message);
	/**		/**
	* @memberof oval_message_iterator		* @memberof oval_message_iterator
	*/		*/
	void oval_message_iterator_free(struct oval_message_iterator *oc_message);		void oval_message_iterator_free(struct oval_message_iterator *oc_message);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators
	* @{
	*/
	/**
	* Return <b>true</b> if the message instance is valid
	* @memberof oval_message
	*/
	bool oval_message_is_valid(struct oval_message *message);
	/**
	* @memberof oval_variable_binding		* @memberof oval_variable_binding
	*/		*/
	struct oval_variable_binding *oval_variable_binding_new(struct oval_variabl e *, char *);		struct oval_variable_binding *oval_variable_binding_new(struct oval_variabl e *, char *);
	/**		/**
	* @return A copy of the specified @ref oval_variable_binding.		* @return A copy of the specified @ref oval_variable_binding.
	* @memberof oval_variable_binding		* @memberof oval_variable_binding
	*/		*/
	struct oval_variable_binding *oval_variable_binding_clone(struct oval_varia ble_binding *,		struct oval_variable_binding *oval_variable_binding_clone(struct oval_varia ble_binding *,
	struct oval_defini tion_model *);		struct oval_defini tion_model *);
	/**		/**
End of changes. 19 change blocks.
	110 lines changed or deleted		4 lines changed or added

	oval_types.h		oval_types.h
	skipping to change at line 197		skipping to change at line 197
	OVAL_IOS_SNMP = OVAL_FAMILY_IOS + 4,		OVAL_IOS_SNMP = OVAL_FAMILY_IOS + 4,
	OVAL_IOS_TCLSH = OVAL_FAMILY_IOS + 5,		OVAL_IOS_TCLSH = OVAL_FAMILY_IOS + 5,
	OVAL_IOS_VERSION_55 = OVAL_FAMILY_IOS + 6		OVAL_IOS_VERSION_55 = OVAL_FAMILY_IOS + 6
	} oval_ios_subtype_t;		} oval_ios_subtype_t;
	/// Linux subtypes		/// Linux subtypes
	typedef enum {		typedef enum {
	OVAL_LINUX_DPKG_INFO = OVAL_FAMILY_LINUX + 1,		OVAL_LINUX_DPKG_INFO = OVAL_FAMILY_LINUX + 1,
	OVAL_LINUX_INET_LISTENING_SERVERS = OVAL_FAMILY_LINUX + 2,		OVAL_LINUX_INET_LISTENING_SERVERS = OVAL_FAMILY_LINUX + 2,
	OVAL_LINUX_RPM_INFO = OVAL_FAMILY_LINUX + 3,		OVAL_LINUX_RPM_INFO = OVAL_FAMILY_LINUX + 3,
	OVAL_LINUX_SLACKWARE_PKG_INFO_TEST = OVAL_FAMILY_LINUX + 4		OVAL_LINUX_SLACKWARE_PKG_INFO_TEST = OVAL_FAMILY_LINUX + 4,
			OVAL_LINUX_PARTITION = OVAL_FAMILY_LINUX + 5,
			OVAL_LINUX_IFLISTENERS = OVAL_FAMILY_LINUX + 6,
			OVAL_LINUX_RPMVERIFY = OVAL_FAMILY_LINUX + 7,
			OVAL_LINUX_SELINUXBOOLEAN = OVAL_FAMILY_LINUX + 8,
			OVAL_LINUX_SELINUXSECURITYCONTEXT = OVAL_FAMILY_LINUX + 9
	} oval_linux_subtype_t;		} oval_linux_subtype_t;
	/// MacOS subtypes		/// MacOS subtypes
	typedef enum {		typedef enum {
	OVAL_MACOS_ACCOUNT_INFO = OVAL_FAMILY_MACOS + 1,		OVAL_MACOS_ACCOUNT_INFO = OVAL_FAMILY_MACOS + 1,
	OVAL_MACOS_INET_LISTENING_SERVERS = OVAL_FAMILY_MACOS + 2,		OVAL_MACOS_INET_LISTENING_SERVERS = OVAL_FAMILY_MACOS + 2,
	OVAL_MACOS_NVRAM_INFO = OVAL_FAMILY_MACOS + 3,		OVAL_MACOS_NVRAM_INFO = OVAL_FAMILY_MACOS + 3,
	OVAL_MACOS_PWPOLICY = OVAL_FAMILY_MACOS + 4		OVAL_MACOS_PWPOLICY = OVAL_FAMILY_MACOS + 4
	} oval_macos_subtype_t;		} oval_macos_subtype_t;
	skipping to change at line 234		skipping to change at line 239
	OVAL_UNIX_FILE = OVAL_FAMILY_UNIX + 1,		OVAL_UNIX_FILE = OVAL_FAMILY_UNIX + 1,
	OVAL_UNIX_INETD = OVAL_FAMILY_UNIX + 2,		OVAL_UNIX_INETD = OVAL_FAMILY_UNIX + 2,
	OVAL_UNIX_INTERFACE = OVAL_FAMILY_UNIX + 3,		OVAL_UNIX_INTERFACE = OVAL_FAMILY_UNIX + 3,
	OVAL_UNIX_PASSWORD = OVAL_FAMILY_UNIX + 4,		OVAL_UNIX_PASSWORD = OVAL_FAMILY_UNIX + 4,
	OVAL_UNIX_PROCESS = OVAL_FAMILY_UNIX + 5,		OVAL_UNIX_PROCESS = OVAL_FAMILY_UNIX + 5,
	OVAL_UNIX_RUNLEVEL = OVAL_FAMILY_UNIX + 6,		OVAL_UNIX_RUNLEVEL = OVAL_FAMILY_UNIX + 6,
	OVAL_UNIX_SCCS = OVAL_FAMILY_UNIX + 7,		OVAL_UNIX_SCCS = OVAL_FAMILY_UNIX + 7,
	OVAL_UNIX_SHADOW = OVAL_FAMILY_UNIX + 8,		OVAL_UNIX_SHADOW = OVAL_FAMILY_UNIX + 8,
	OVAL_UNIX_UNAME = OVAL_FAMILY_UNIX + 9,		OVAL_UNIX_UNAME = OVAL_FAMILY_UNIX + 9,
	OVAL_UNIX_XINETD = OVAL_FAMILY_UNIX + 10,		OVAL_UNIX_XINETD = OVAL_FAMILY_UNIX + 10,
	OVAL_UNIX_DNSCACHE = OVAL_FAMILY_UNIX + 11		OVAL_UNIX_DNSCACHE = OVAL_FAMILY_UNIX + 11,
			OVAL_UNIX_SYSCTL = OVAL_FAMILY_UNIX + 12,
			OVAL_UNIX_PROCESS58 = OVAL_FAMILY_UNIX + 13,
			OVAL_UNIX_FILEEXTENDEDATTRIBUTE = OVAL_FAMILY_UNIX + 14,
			OVAL_UNIX_GCONF = OVAL_FAMILY_UNIX + 15,
			OVAL_UNIX_ROUTINGTABLE = OVAL_FAMILY_UNIX + 16
	} oval_unix_subtype_t;		} oval_unix_subtype_t;
	/// Windows subtypes		/// Windows subtypes
	typedef enum {		typedef enum {
	OVAL_WINDOWS_ACCESS_TOKEN = OVAL_FAMILY_WINDOWS + 1,		OVAL_WINDOWS_ACCESS_TOKEN = OVAL_FAMILY_WINDOWS + 1,
	OVAL_WINDOWS_ACTIVE_DIRECTORY = OVAL_FAMILY_WINDOWS + 2,		OVAL_WINDOWS_ACTIVE_DIRECTORY = OVAL_FAMILY_WINDOWS + 2,
	OVAL_WINDOWS_AUDIT_EVENT_POLICY = OVAL_FAMILY_WINDOWS + 3,		OVAL_WINDOWS_AUDIT_EVENT_POLICY = OVAL_FAMILY_WINDOWS + 3,
	OVAL_WINDOWS_AUDIT_EVENT_SUBCATEGORIES = OVAL_FAMILY_WINDOWS + 4,		OVAL_WINDOWS_AUDIT_EVENT_SUBCATEGORIES = OVAL_FAMILY_WINDOWS + 4,
	OVAL_WINDOWS_FILE = OVAL_FAMILY_WINDOWS + 5,		OVAL_WINDOWS_FILE = OVAL_FAMILY_WINDOWS + 5,
	OVAL_WINDOWS_FILE_AUDITED_PERMISSIONS_53 = OVAL_FAMILY_WINDOWS + 6,		OVAL_WINDOWS_FILE_AUDITED_PERMISSIONS_53 = OVAL_FAMILY_WINDOWS + 6,
End of changes. 2 change blocks.
	2 lines changed or deleted		12 lines changed or added

	oval_variables.h		oval_variables.h
	skipping to change at line 77		skipping to change at line 77
	* @memberof oval_variable_model		* @memberof oval_variable_model
	*/		*/
	int oval_variable_model_export (struct oval_variable_model *, const char *f ile);		int oval_variable_model_export (struct oval_variable_model *, const char *f ile);
	/**		/**
	* @name Setters		* @name Setters
	* @{		* @{
	*/		*/
	void oval_variable_model_set_generator(struct oval_variable_model *model, s truct oval_generator *generator);		void oval_variable_model_set_generator(struct oval_variable_model *model, s truct oval_generator *generator);
	/**		/**
	* Lock the variable_model instance.
	* The state of a locked instance cannot be changed.
	* This operation has no effect if the model is already locked.
	* @memberof oval_variable_model
	*/
	void oval_variable_model_lock(struct oval_variable_model *variable_model);
	/**
	* Get the values bound to a specified external variable.		* Get the values bound to a specified external variable.
	* If the varid does not resolve to a managed external variable, this metho d returns NULL.		* If the varid does not resolve to a managed external variable, this metho d returns NULL.
	* @param variable_model the specified oval_variable_model.		* @param variable_model the specified oval_variable_model.
	* @param varid the identifier of the required oval_variable.		* @param varid the identifier of the required oval_variable.
	* @memberof oval_variable_model		* @memberof oval_variable_model
	*/		*/
	void oval_variable_model_add(struct oval_variable_model *model, char *varid , const char *comment, oval_datatype_t datatype, char *value);		void oval_variable_model_add(struct oval_variable_model *model, char *varid , const char *comment, oval_datatype_t datatype, char *value);
	/** @} */		/** @} */
	/**		/**
	skipping to change at line 135		skipping to change at line 128
	* @memberof oval_variable_model		* @memberof oval_variable_model
	*/		*/
	const char *oval_variable_model_get_comment (struct oval_variable_model *, char *);		const char *oval_variable_model_get_comment (struct oval_variable_model *, char *);
	/**		/**
	* Get the values bound to a specified external variable.		* Get the values bound to a specified external variable.
	* If the varid does not resolve to a managed external variable, this metho d returns NULL.		* If the varid does not resolve to a managed external variable, this metho d returns NULL.
	* @param variable_model the specified oval_variable_model.		* @param variable_model the specified oval_variable_model.
	* @param varid the identifier of the required oval_variable.		* @param varid the identifier of the required oval_variable.
	* @memberof oval_variable_model		* @memberof oval_variable_model
	*/		*/
	struct oval_string_iterator *oval_variable_model_get_values (struct oval_va		struct oval_value_iterator *oval_variable_model_get_values(struct oval_vari
	riable_model *, char *);		able_model *, char *);
			/** @} */
	/**		/**
	* Return <b>true</b> if the variable_model instance is locked.		* @name Iterators
	* The state of a locked instance cannot be changed.		* @{
	* @memberof oval_variable_model
	*/		*/
	bool oval_variable_model_is_locked(struct oval_variable_model *variable_mod		/**
	el);		* @struct oval_variable_model_iterator
			* @see oval_definition_model_get_bound_variable_models
			*/
			struct oval_variable_model_iterator;
			/**
			* Returns <b>true</b> if iterator not exhausted.
			* @memberof oval_variable_model_iterator
			*/
			bool oval_variable_model_iterator_has_more(struct oval_variable_model_itera
			tor *);
			/**
			* Returns next instance of @ref oval_variable_model.
			* @memberof oval_variable_model_iterator
			*/
			struct oval_variable_model *oval_variable_model_iterator_next(struct oval_v
			ariable_model_iterator *);
			/**
			* Free iterator.
			* @memberof oval_variable_model_iterator
			*/
			void oval_variable_model_iterator_free(struct oval_variable_model_iterator
			*);
	/** @} */		/** @} */
	/**		/**
	* @name Evaluators		* @name Evaluators
	* @{		* @{
	*/		*/
	/**
	* Return <b>true</b> if the variable_model instance is valid
	* @memberof oval_variable_model
	*/
	bool oval_variable_model_is_valid(struct oval_variable_model *variable_mode
	l);
	/** @} */		/** @} */
	/**		/**
	* @}END OVALVAR		* @}END OVALVAR
	* @}END OVAL		* @}END OVAL
	*/		*/
	#endif /* OVAL_VARIABLES_H_ */		#endif /* OVAL_VARIABLES_H_ */
End of changes. 5 change blocks.
	20 lines changed or deleted		29 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/