cpe_dict.h		cpe_dict.h
	skipping to change at line 14		skipping to change at line 14
	* @addtogroup cpedict CPE Dictionary		* @addtogroup cpedict CPE Dictionary
	* @{		* @{
	*		*
	* @image html cpe_dictionary.png "Class diagram"		* @image html cpe_dictionary.png "Class diagram"
	* @file cpe_dict.h		* @file cpe_dict.h
	*		*
	* \brief Interface to Common Platform Enumeration (CPE) Dictionary.		* \brief Interface to Common Platform Enumeration (CPE) Dictionary.
	*/		*/
	/*		/*
	* Copyright 2009--2013 Red Hat Inc., Durham, North Carolina.		* Copyright 2009--2014 Red Hat Inc., Durham, North Carolina.
	* All Rights Reserved.		* All Rights Reserved.
	*		*
	* This library is free software; you can redistribute it and/or		* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public		* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either		* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.		* version 2.1 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	skipping to change at line 43		skipping to change at line 43
	* Lukas Kuklinek <lkuklinek@redhat.com>		* Lukas Kuklinek <lkuklinek@redhat.com>
	* Šimon Lukašík		* Šimon Lukašík
	*/		*/
	#ifndef CPEDICT_H_		#ifndef CPEDICT_H_
	#define CPEDICT_H_		#define CPEDICT_H_
	#include "oscap.h"		#include "oscap.h"
	#include "cpe_name.h"		#include "cpe_name.h"
	#include "oscap_text.h"		#include "oscap_text.h"
			#include "oscap_source.h"
	/**		/**
	* @struct cpe_dict_model		* @struct cpe_dict_model
	* Structure representing a CPE dictionary.		* Structure representing a CPE dictionary.
	*/		*/
	struct cpe_dict_model;		struct cpe_dict_model;
	/**		/**
	* @struct cpe_item		* @struct cpe_item
	* Structure representing single CPE dictionary item.		* Structure representing single CPE dictionary item.
	skipping to change at line 870		skipping to change at line 871
	* Get the newest supported version of CPE dictionary XML		* Get the newest supported version of CPE dictionary XML
	* @return version of XML file format		* @return version of XML file format
	* @memberof cpe_dict_model		* @memberof cpe_dict_model
	*/		*/
	const char * cpe_dict_model_supported(void);		const char * cpe_dict_model_supported(void);
	/**		/**
	* Detects which version the given CPE file is		* Detects which version the given CPE file is
	*		*
	* Deallocate the result after use with "free(..)".		* Deallocate the result after use with "free(..)".
			* @deprecated This function has been deprecated by @ref oscap_source_get_s
			chema_version.
			* This function may be dropped from later versions of the library.
	*/		*/
	char * cpe_dict_detect_version(const char* file);		OSCAP_DEPRECATED(char *cpe_dict_detect_version(const char* file));
	/**		/**
	* Verify wether given CPE is known according to specified dictionary		* Verify wether given CPE is known according to specified dictionary
	* @memberof cpe_name		* @memberof cpe_name
	* @memberof cpe_dict_model		* @memberof cpe_dict_model
	* @param cpe CPE to verify		* @param cpe CPE to verify
	* @param dict used CPE dictionary		* @param dict used CPE dictionary
	* @return true if dictionary contains given CPE		* @return true if dictionary contains given CPE
	*/		*/
	bool cpe_name_match_dict(struct cpe_name *cpe, struct cpe_dict_model *dict) ;		bool cpe_name_match_dict(struct cpe_name *cpe, struct cpe_dict_model *dict) ;
	skipping to change at line 923		skipping to change at line 926
	* @memberof cpe_dict_model		* @memberof cpe_dict_model
	*/		*/
	void cpe_dict_model_export(const struct cpe_dict_model *dict, const char *f ile);		void cpe_dict_model_export(const struct cpe_dict_model *dict, const char *f ile);
	/**		/**
	* Load new CPE dictionary from file		* Load new CPE dictionary from file
	* @memberof cpe_dict_model		* @memberof cpe_dict_model
	* @param file filename		* @param file filename
	* @return new dictionary		* @return new dictionary
	* @retval NULL on failure		* @retval NULL on failure
			* @deprecated This function has been deprecated by @ref cpe_dict_model_imp
			ort_source.
			* This function may be dropped from later versions of the library.
			*/
			OSCAP_DEPRECATED(struct cpe_dict_model *cpe_dict_model_import(const char *f
			ile));
			/**
			* Load new CPE dictionary from an oscap_source
			* @memberof cpe_dict_model
			* @param source The oscap_source to parse content from
			* @returns new dictionary or NULL
	*/		*/
	struct cpe_dict_model *cpe_dict_model_import(const char *file);		struct cpe_dict_model *cpe_dict_model_import_source(struct oscap_source *so urce);
	/**		/**
	* Sets the origin file hint		* Sets the origin file hint
	* @note This is intended for internal use only!		* @note This is intended for internal use only!
	* @see cpe_dict_model_get_origin_file		* @see cpe_dict_model_get_origin_file
	*/		*/
	bool cpe_dict_model_set_origin_file(struct cpe_dict_model* dict, const char * origin_file);		bool cpe_dict_model_set_origin_file(struct cpe_dict_model* dict, const char * origin_file);
	/**		/**
	* Gets the file the CPE dict model was loaded from		* Gets the file the CPE dict model was loaded from
End of changes. 6 change blocks.
	3 lines changed or deleted		19 lines changed or added

	cpe_lang.h		cpe_lang.h
	skipping to change at line 14		skipping to change at line 14
	* @addtogroup cpelang CPE Language		* @addtogroup cpelang CPE Language
	* @{		* @{
	*		*
	* @image html cpe_language.png "Class diagram"		* @image html cpe_language.png "Class diagram"
	* @file cpe_lang.h		* @file cpe_lang.h
	*		*
	* @brief Interface to Common Platform Enumeration (CPE) Language		* @brief Interface to Common Platform Enumeration (CPE) Language
	*/		*/
	/*		/*
	* Copyright 2009 Red Hat Inc., Durham, North Carolina.		* Copyright 2009--2014 Red Hat Inc., Durham, North Carolina.
	* All Rights Reserved.		* All Rights Reserved.
	*		*
	* This library is free software; you can redistribute it and/or		* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public		* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either		* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.		* version 2.1 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	skipping to change at line 42		skipping to change at line 42
	* Lukas Kuklinek <lkuklinek@redhat.com>		* Lukas Kuklinek <lkuklinek@redhat.com>
	* Maros Barabas <mbarabas@redhat.com>		* Maros Barabas <mbarabas@redhat.com>
	*/		*/
	#ifndef CPELANG_H_		#ifndef CPELANG_H_
	#define CPELANG_H_		#define CPELANG_H_
	#include <stdlib.h>		#include <stdlib.h>
	#include "cpe_name.h"		#include "cpe_name.h"
			#include "oscap.h"
	#include "oscap_text.h"		#include "oscap_text.h"
			#include "oscap_source.h"
	/**		/**
	* CPE language operators		* CPE language operators
	*/		*/
	typedef enum {		typedef enum {
	CPE_LANG_OPER_INVALID = 0x00, ///< invalid or unknown operation		CPE_LANG_OPER_INVALID = 0x00, ///< invalid or unknown operation
	CPE_LANG_OPER_AND = 0x01, ///< logical AND		CPE_LANG_OPER_AND = 0x01, ///< logical AND
	CPE_LANG_OPER_OR = 0x02, ///< logical OR		CPE_LANG_OPER_OR = 0x02, ///< logical OR
	CPE_LANG_OPER_MATCH = 0x04, ///< fact-ref = match given CPE name against available dictionaries		CPE_LANG_OPER_MATCH = 0x04, ///< fact-ref = match given CPE name against available dictionaries
	CPE_LANG_OPER_CHECK = 0x08, ///< check-ref = evaluate given check		CPE_LANG_OPER_CHECK = 0x08, ///< check-ref = evaluate given check
	skipping to change at line 357		skipping to change at line 359
	/**		/**
	* Get supported version of CPE language XML		* Get supported version of CPE language XML
	* @return version of XML file format		* @return version of XML file format
	* @memberof cpe_lang_model		* @memberof cpe_lang_model
	*/		*/
	const char * cpe_lang_model_supported(void);		const char * cpe_lang_model_supported(void);
	/**		/**
	* Detect version of given CPE language XML		* Detect version of given CPE language XML
	* @memberof cpe_lang_model		* @memberof cpe_lang_model
			* @deprecated This function has been deprecated by @ref oscap_source_get_s
			chema_version.
			* This function may be dropped from later versions of the library.
	*/		*/
	char * cpe_lang_model_detect_version(const char* file);		OSCAP_DEPRECATED(char * cpe_lang_model_detect_version(const char* file));
	/**		/**
	* Function to match cpe in platform		* Function to match cpe in platform
	* @param cpe to be matched with		* @param cpe to be matched with
	* @param n size		* @param n size
	* @param platform CPE platform		* @param platform CPE platform
	* @memberof cpe_platform		* @memberof cpe_platform
	*/		*/
	bool cpe_platform_match_cpe(struct cpe_name **cpe, size_t n, const struct c pe_platform *platform);		bool cpe_platform_match_cpe(struct cpe_name **cpe, size_t n, const struct c pe_platform *platform);
	/************************************************************/		/************************************************************/
	/** @} End of Evaluators group */		/** @} End of Evaluators group */
	/**		/**
	* Load CPE language model from a XML document.		* Load CPE language model from a XML document.
	* @memberof cpe_lang_model		* @memberof cpe_lang_model
			* @deprecated This function has been deprecated by @ref cpe_lang_model_imp
			ort_source
			* This function may be dropped from later versions of the library.
	*/		*/
	struct cpe_lang_model *cpe_lang_model_import(const char *file);		OSCAP_DEPRECATED(struct cpe_lang_model *cpe_lang_model_import(const char *f
			ile));
			/**
			* Load CPE language model from an oscap_source.
			* @memberof cpe_lang_model
			*/
			struct cpe_lang_model *cpe_lang_model_import_source(struct oscap_source *so
			urce);
	/**		/**
	* Sets the origin file hint		* Sets the origin file hint
	* @note This is intended for internal use only!		* @note This is intended for internal use only!
	* @see cpe_lang_model_get_origin_file		* @see cpe_lang_model_get_origin_file
	*/		*/
	bool cpe_lang_model_set_origin_file(struct cpe_lang_model* lang_model, cons t char* origin_file);		bool cpe_lang_model_set_origin_file(struct cpe_lang_model* lang_model, cons t char* origin_file);
	/**		/**
	* Gets the file the CPE dict model was loaded from		* Gets the file the CPE dict model was loaded from
End of changes. 7 change blocks.
	3 lines changed or deleted		19 lines changed or added

	oscap.h		oscap.h
	skipping to change at line 84		skipping to change at line 84
	const char *oscap_get_version(void);		const char *oscap_get_version(void);
	/**		/**
	* @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_UNKNOWN = 0, ///< The type is unknown
			OSCAP_DOCUMENT_OVAL_DEFINITIONS, ///< OVAL Definitions file
	OSCAP_DOCUMENT_OVAL_VARIABLES, ///< OVAL Variables		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_OVAL_DIRECTIVES, ///< OVAL directives file		OSCAP_DOCUMENT_OVAL_DIRECTIVES, ///< OVAL directives 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_CVE_FEED, ///< CVE NVD feed		OSCAP_DOCUMENT_CVE_FEED, ///< CVE NVD feed
	OSCAP_DOCUMENT_SCE_RESULT, ///< SCE result file		OSCAP_DOCUMENT_SCE_RESULT, ///< SCE result file
	OSCAP_DOCUMENT_SDS, ///< Source Data Stream file		OSCAP_DOCUMENT_SDS, ///< Source Data Stream file
	skipping to change at line 128		skipping to change at line 129
	*		*
	* Directory structure must adhere $SCHEMA_PATH/$STANDARD/$VERSION/$SCHEMAF ILE.xsd structure, where $STANDARD		* Directory structure must adhere $SCHEMA_PATH/$STANDARD/$VERSION/$SCHEMAF ILE.xsd structure, where $STANDARD
	* is oval, xccdf, etc., and $VERSION is a version of the standard.		* is oval, xccdf, etc., and $VERSION is a version of the standard.
	*		*
	* @param xmlfile File to be validated.		* @param xmlfile File to be validated.
	* @param doctype Document type represented by the file.		* @param doctype Document type represented by the file.
	* @param version Version of the document, use NULL for library's default.		* @param version Version of the document, use NULL for library's default.
	* @param reporter A reporter to by notified of encountered issues. Can be NULL, if a binary document validates / does not validate answer is satisfac tonary.		* @param reporter A reporter to by notified of encountered issues. Can be NULL, if a binary document validates / does not validate answer is satisfac tonary.
	* @param arg Argument for the reporter.		* @param arg Argument for the reporter.
	* @return 0 on pass; -1 error; 1 fail		* @return 0 on pass; -1 error; 1 fail
			* @deprecated This function has been deprecated and it may be dropped from
			later
			* OpenSCAP releases. Please use oscap_source_validate instead.
	*/		*/
	int oscap_validate_document(const char *xmlfile, oscap_document_type_t doct ype, const char *version, xml_reporter reporter, void *arg);		OSCAP_DEPRECATED(int oscap_validate_document(const char *xmlfile, oscap_doc ument_type_t doctype, const char *version, xml_reporter reporter, void *arg ));
	/**		/**
	* Validate a SCAP document file against schematron rules.		* Validate a SCAP document file against schematron rules.
	*		*
	* The rules are searched relative to path specified by the OSCAP_SCHEMA_PA TH environment variable.		* The rules are searched relative to path specified by the OSCAP_SCHEMA_PA TH environment variable.
	* 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 validated.		* @param xmlfile File to be validated.
	* @param doctype Document type represented by the file.		* @param doctype Document type represented by the file.
	* @param version Version of the document, use NULL for library's default.		* @param version Version of the document, use NULL for library's default.
	* @param outfile Report from schematron validation is written into the out file. If NULL, stdou will be used.		* @param outfile Report from schematron validation is written into the out file. If NULL, stdou will be used.
	* @return 0 on pass; <0 error; >0 fail		* @return 0 on pass; <0 error; >0 fail
			* @deprecated This function has been deprecated and it may be dropped from
			later
			* OpenSCAP releases. Please use oscap_source_validate_schematron instead.
	*/		*/
	int oscap_schematron_validate_document(const char *xmlfile, oscap_document_ type_t doctype, const char *version, const char *outfile);		OSCAP_DEPRECATED(int oscap_schematron_validate_document(const char *xmlfile , oscap_document_type_t doctype, const char *version, const char *outfile)) ;
	/**		/**
	* Apply a XSLT stylesheet to a XML file.		* Apply a XSLT stylesheet to a XML file.
	*		*
	* If xsltfile is not an absolute path, the file will be searched relativel y to a path specified by the OSCAP_XSLT_PATH environment variable.		* If xsltfile is not an absolute path, the file will be searched relativel y to a path specified by the OSCAP_XSLT_PATH environment variable.
	* 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 file		* @param xsltfile XSLT file
	* @param outfile Result file shall be written here (NULL for stdout).		* @param outfile Result file shall be written here (NULL for stdout).
	skipping to change at line 179		skipping to change at line 184
	*/		*/
	OSCAP_DEPRECATED(const char * oscap_path_to_schematron(void));		OSCAP_DEPRECATED(const char * oscap_path_to_schematron(void));
	/**		/**
	* Function returns path used to locate OpenSCAP Default CPE files		* Function returns path used to locate OpenSCAP Default CPE files
	*/		*/
	const char * oscap_path_to_cpe(void);		const char * oscap_path_to_cpe(void);
	/**		/**
	* Determine document type		* Determine document type
			* @deprecated This function has been deprecated and it may be dropped from
			later
			* OpenSCAP releases. Please use oscap_source_get_scap_type instead.
	*/		*/
	int oscap_determine_document_type(const char *document, oscap_document_type _t *doc_type);		OSCAP_DEPRECATED(int oscap_determine_document_type(const char *document, os cap_document_type_t *doc_type));
	/************************************************************/		/************************************************************/
	/** @} validation group end */		/** @} validation group end */
	/** @} */		/** @} */
	#endif		#endif
End of changes. 7 change blocks.
	4 lines changed or deleted		14 lines changed or added

	oscap_text.h		oscap_text.h
	skipping to change at line 248		skipping to change at line 248
	*		*
	* Iterates through given texts and looks at each to see if the language ma tches		* Iterates through given texts and looks at each to see if the language ma tches
	* given preferred_lang. If preferred_lang is NULL, OSCAP_DEFAULT_LANG is m atched.		* given preferred_lang. If preferred_lang is NULL, OSCAP_DEFAULT_LANG is m atched.
	*		*
	* If a match is found it, a copy of plaintext representation of that text is		* If a match is found it, a copy of plaintext representation of that text is
	* returned. If nothing is found, plaintext representation of the first tex t in		* returned. If nothing is found, plaintext representation of the first tex t in
	* the list is returned. If the textlist is empty, NULL is returned.		* the list is returned. If the textlist is empty, NULL is returned.
	*/		*/
	char* oscap_textlist_get_preferred_plaintext(struct oscap_text_iterator* te xts, const char* preferred_lang);		char* oscap_textlist_get_preferred_plaintext(struct oscap_text_iterator* te xts, const char* preferred_lang);
			/**
			* @brief gets oscap_text representing given textlist
			*
			* Similar to @ref oscap_textlist_get_preferred_plaintext but returns oscap
			_text
			* instead of just the plaintext.
			*/
			struct oscap_text *oscap_textlist_get_preferred_text(struct oscap_text_iter
			ator *texts, const char *preferred_lang);
	/** @} */		/** @} */
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		10 lines changed or added

	oval_definitions.h		oval_definitions.h
	skipping to change at line 17		skipping to change at line 17
	*		*
	* Class diagram		* Class diagram
	* \image html definition_model.png		* \image html definition_model.png
	*		*
	* @file		* @file
	*		*
	* @author "David Niemoller" <David.Niemoller@g2-inc.com>		* @author "David Niemoller" <David.Niemoller@g2-inc.com>
	*/		*/
	/*		/*
	* Copyright 2009-2013 Red Hat Inc., Durham, North Carolina.		* Copyright 2009-2014 Red Hat Inc., Durham, North Carolina.
	* All Rights Reserved.		* All Rights Reserved.
	*		*
	* This library is free software; you can redistribute it and/or		* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public		* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either		* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.		* version 2.1 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	skipping to change at line 41		skipping to change at line 41
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A		* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*		*
	* Authors:		* Authors:
	* "David Niemoller" <David.Niemoller@g2-inc.com>		* "David Niemoller" <David.Niemoller@g2-inc.com>
	*/		*/
	#ifndef OVAL_DEFINITIONS		#ifndef OVAL_DEFINITIONS
	#define OVAL_DEFINITIONS		#define OVAL_DEFINITIONS
			#include "oscap.h"
			#include "oscap_source.h"
	#include "oval_adt.h"		#include "oval_adt.h"
	#include "oval_types.h"		#include "oval_types.h"
	#include "oval_version.h"		#include "oval_version.h"
	#include <stdbool.h>		#include <stdbool.h>
	/**		/**
	* Affected family enumeration.		* Affected family enumeration.
	* Since new family values can only be added with new version of the schema ,		* Since new family values can only be added with new version of the schema ,
	* the value OVAL_AFCFML_UNDEFINED is to be used when the desired family is not available		* the value OVAL_AFCFML_UNDEFINED is to be used when the desired family is not available
	*/		*/
	skipping to change at line 581		skipping to change at line 583
	*/		*/
	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);
	void oval_generator_set_product_name(struct oval_generator *generator, char		void oval_generator_set_product_name(struct oval_generator *generator, cons
	*product_name);		t char *product_name);
	void oval_generator_set_product_version(struct oval_generator *generator, c		void oval_generator_set_product_version(struct oval_generator *generator, c
	har *product_version);		onst char *product_version);
	void oval_generator_set_schema_version(struct oval_generator *generator, ch		void oval_generator_set_schema_version(struct oval_generator *generator, co
	ar *schema_version);		nst char *schema_version);
	void oval_generator_set_timestamp(struct oval_generator *generator, char *t		void oval_generator_set_timestamp(struct oval_generator *generator, const c
	imestamp);		har *timestamp);
	/**		/**
	* 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);
			/**
			* Import the content of the oscap_source into the oval_definition_model
			* @memberof oval_definition_model
			* @param source The oscap_source to import from
			* @returns newly build oval_definition_model, or NULL if something went wr
			ong
			*/
			struct oval_definition_model *oval_definition_model_import_source(struct os
			cap_source *source);
	/**		/**
	* Import the content from the file into an oval_definition_model.		* Import the content from the file into an oval_definition_model.
	* @param file filename		* @param file filename
	* @return new oval_definition_model, or NULL if an error occurred		* @return new oval_definition_model, or NULL if an error occurred
	* @memberof oval_definition_model		* @memberof oval_definition_model
			* @deprecated This function has been deprecated and it may be dropped from
			later
			* OpenSCAP releases. Please use oval_definition_model_import_source instea
			d.
	*/		*/
	struct oval_definition_model * oval_definition_model_import(const char *fil e);		OSCAP_DEPRECATED(struct oval_definition_model *oval_definition_model_import (const char *file));
	/**		/**
	* Merge the content from the file with specified oval_definition_model.		* Merge the content from the file with specified oval_definition_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 -1 if an error occurred
	* @memberof oval_definition_model		* @memberof oval_definition_model
			* @deprecated This function has been deprecated and it may be dropped from
			later
			* OpenSCAP releases.
	*/		*/
	int oval_definition_model_merge(struct oval_definition_model *model, const char *file);		OSCAP_DEPRECATED(int oval_definition_model_merge(struct oval_definition_mod el *model, const char *file));
	/**		/**
	* Copy an oval_definition_model.		* Copy an oval_definition_model.
	* @return A copy of the specified @ref oval_definition_model.		* @return A copy of the specified @ref oval_definition_model.
	* @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
	skipping to change at line 3147		skipping to change at line 3162
	/** @} */		/** @} */
	/**		/**
	* @} END OVALDEF		* @} END OVALDEF
	*/		*/
	/**		/**
	* Returns the version of the schema this document should be validated agai nst		* Returns the version of the schema this document should be validated agai nst
	*		*
	* Deallocate the result after use with "free(..)".		* Deallocate the result after use with "free(..)".
			* @deprecated This function has been deprecated by @ref oscap_source_get_s
			chema_version.
			* This function may be dropped from later versions of the library.
	*/		*/
	char *oval_determine_document_schema_version(const char *, oscap_document_t ype_t);		OSCAP_DEPRECATED(char *oval_determine_document_schema_version(const char *, oscap_document_type_t));
	/**		/**
	* @} END OVAL		* @} END OVAL
	*/		*/
	#endif		#endif
End of changes. 10 change blocks.
	12 lines changed or deleted		35 lines changed or added

	oval_directives.h		oval_directives.h
	skipping to change at line 16		skipping to change at line 16
	* @{		* @{
	*		*
	* @file		* @file
	*		*
	* @author "Peter Vrabec" <pvrabec@redhat.com>		* @author "Peter Vrabec" <pvrabec@redhat.com>
	*		*
	*		*
	*/		*/
	/*		/*
	* Copyright 2011 Red Hat Inc., Durham, North Carolina.		* Copyright 2011--2014 Red Hat Inc., Durham, North Carolina.
	* All Rights Reserved.		* All Rights Reserved.
	*		*
	* This library is free software; you can redistribute it and/or		* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public		* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either		* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.		* version 2.1 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	skipping to change at line 40		skipping to change at line 40
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A		* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*		*
	* Authors:		* Authors:
	* "David Niemoller" <David.Niemoller@g2-inc.com>		* "David Niemoller" <David.Niemoller@g2-inc.com>
	*/		*/
	#ifndef OVAL_DIRECTIVES_H_		#ifndef OVAL_DIRECTIVES_H_
	#define OVAL_DIRECTIVES_H_		#define OVAL_DIRECTIVES_H_
			#include "oscap.h"
			#include "oscap_source.h"
	#include "oval_types.h"		#include "oval_types.h"
	/**		/**
	* @typedef oval_result_directive_content_t		* @typedef oval_result_directive_content_t
	* Values for the directives controlling the expected content of the result s file		* Values for the directives controlling the expected content of the result s file
	*/		*/
	typedef enum {		typedef enum {
	OVAL_DIRECTIVE_CONTENT_UNKNOWN = 0, /**< Undefined value */		OVAL_DIRECTIVE_CONTENT_UNKNOWN = 0, /**< Undefined value */
	OVAL_DIRECTIVE_CONTENT_THIN = 1, /**< Only the minimal amount of information will be provided. */		OVAL_DIRECTIVE_CONTENT_THIN = 1, /**< Only the minimal amount of information will be provided. */
	OVAL_DIRECTIVE_CONTENT_FULL = 2 /**< Very detailed information w ill be provided allowing in-depth reports to be generated from the results. */		OVAL_DIRECTIVE_CONTENT_FULL = 2 /**< Very detailed information w ill be provided allowing in-depth reports to be generated from the results. */
	skipping to change at line 66		skipping to change at line 68
	struct oval_directives_model;		struct oval_directives_model;
	/**		/**
	* @memberof oval_directives_model		* @memberof oval_directives_model
	*/		*/
	struct oval_directives_model *oval_directives_model_new(void);		struct oval_directives_model *oval_directives_model_new(void);
	/**		/**
	* @memberof oval_directives_model		* @memberof oval_directives_model
	*/		*/
	void oval_directives_model_free(struct oval_directives_model *);		void oval_directives_model_free(struct oval_directives_model *);
			/**
			* Import the data from oscap_source to the directives model.
			* @memberof oval_directives_model
			*/
			int oval_directives_model_import_source(struct oval_directives_model *model
			, struct oscap_source *source);
	/**		/**
	* @memberof oval_directives_model		* @memberof oval_directives_model
			* @deprecated This function has been deprecated and it may be dropped from
			later
			* OpenSCAP releases. Please use oval_directives_model_import_source instea
			d.
	*/		*/
	int oval_directives_model_import(struct oval_directives_model *, char *);		OSCAP_DEPRECATED(int oval_directives_model_import(struct oval_directives_mo
			del *, char *));
	/**		/**
	* @memberof oval_directives_model		* @memberof oval_directives_model
	*/		*/
	struct oval_generator *oval_directives_model_get_generator(struct oval_dire ctives_model *);		struct oval_generator *oval_directives_model_get_generator(struct oval_dire ctives_model *);
	/**		/**
	* @memberof oval_directives_model		* @memberof oval_directives_model
	*/		*/
	struct oval_result_directives *oval_directives_model_get_defdirs(struct ova l_directives_model *);		struct oval_result_directives *oval_directives_model_get_defdirs(struct ova l_directives_model *);
	/**		/**
	* @memberof oval_directives_model		* @memberof oval_directives_model
End of changes. 5 change blocks.
	2 lines changed or deleted		18 lines changed or added

	oval_results.h		oval_results.h
	skipping to change at line 19		skipping to change at line 19
	* \image html result_model.png		* \image html result_model.png
	*		*
	* @file		* @file
	*		*
	* @author "David Niemoller" <David.Niemoller@g2-inc.com>		* @author "David Niemoller" <David.Niemoller@g2-inc.com>
	*		*
	*		*
	*/		*/
	/*		/*
	* Copyright 2009-2013 Red Hat Inc., Durham, North Carolina.		* Copyright 2009-2014 Red Hat Inc., Durham, North Carolina.
	* All Rights Reserved.		* All Rights Reserved.
	*		*
	* This library is free software; you can redistribute it and/or		* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public		* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either		* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.		* version 2.1 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	skipping to change at line 44		skipping to change at line 44
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A		* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*		*
	* Authors:		* Authors:
	* "David Niemoller" <David.Niemoller@g2-inc.com>		* "David Niemoller" <David.Niemoller@g2-inc.com>
	* Šimon Lukašík		* Šimon Lukašík
	*/		*/
	#ifndef OVAL_RESULTS_H_		#ifndef OVAL_RESULTS_H_
	#define OVAL_RESULTS_H_		#define OVAL_RESULTS_H_
			#include "oscap.h"
			#include "oscap_source.h"
	#include "oval_types.h"		#include "oval_types.h"
	#include "oval_system_characteristics.h"		#include "oval_system_characteristics.h"
	#include "oval_directives.h"		#include "oval_directives.h"
	#include <stdbool.h>		#include <stdbool.h>
	const char *oval_result_get_text(oval_result_t);		const char *oval_result_get_text(oval_result_t);
	/**		/**
	* @struct oval_results_model		* @struct oval_results_model
	* OVAL Results Model holds OVAL results structure instances.		* OVAL Results Model holds OVAL results structure instances.
	skipping to change at line 116		skipping to change at line 118
	/**		/**
	* Create new oval_results_model.		* Create new oval_results_model.
	* The new model is bound to a specified oval_definition_model and variable bindings.		* The new model is bound to a specified oval_definition_model and variable bindings.
	* @param definition_model the specified oval_definition_model.		* @param definition_model the specified oval_definition_model.
	* @param syschar_model the array of specified oval_syschar_model(s) termin ated by NULL.		* @param syschar_model the array of specified oval_syschar_model(s) termin ated by NULL.
	* @memberof oval_results_model		* @memberof oval_results_model
	*/		*/
	struct oval_results_model *oval_results_model_new(struct oval_definition_mo del *definition_model,		struct oval_results_model *oval_results_model_new(struct oval_definition_mo del *definition_model,
	struct oval_syschar_model **);		struct oval_syschar_model **);
			/**
			* Import the content from the oscap_source into an oval_result_model.
			* If imported content specifies a model entity that is already registered
			within the model its content is overwritten.
			* @memberof oval_results_model
			* @param model the oval_results_model
			* @param source The oscap_source to import from
			* @return -1 if an error occurred
			*/
			int oval_results_model_import_source(struct oval_results_model *model, stru
			ct oscap_source *source);
	/**		/**
	* Import the content from the file into an oval_result_model.		* Import the content from the file into an oval_result_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 oval_results_model		* @param model the oval_results_model
	* @param file filename		* @param file filename
	* @return -1 if an error occurred		* @return -1 if an error occurred
	* @memberof oval_results_model		* @memberof oval_results_model
			* @deprecated This function has been deprecated and it may be dropped from
			later
			* OpenSCAP releases. Please use oval_results_model_import_source instead.
	*/		*/
	int oval_results_model_import(struct oval_results_model *model, const char *file);		OSCAP_DEPRECATED(int oval_results_model_import(struct oval_results_model *m odel, const char *file));
	/**		/**
	* Copy an oval_results_model.		* Copy an oval_results_model.
	* @return A copy of the specified @ref oval_results_model.		* @return A copy of the specified @ref oval_results_model.
	* @memberof oval_results_model		* @memberof oval_results_model
	*/		*/
	struct oval_results_model *oval_results_model_clone(struct oval_results_mod el *);		struct oval_results_model *oval_results_model_clone(struct oval_results_mod el *);
	/**		/**
	* Free memory allocated to a specified oval results model.		* Free memory allocated to a specified oval results model.
	* @param the specified oval_results model		* @param the specified oval_results model
	* @memberof oval_results_model		* @memberof oval_results_model
	skipping to change at line 147		skipping to change at line 162
	/**		/**
	* Export oval results into file.		* Export oval results into file.
	* @param model the oval_results_model		* @param model the oval_results_model
	* @param model the oval_directives_model		* @param model the oval_directives_model
	* @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_dire ctives_model *, const char *file);		int oval_results_model_export(struct oval_results_model *, struct oval_dire ctives_model *, const char *file);
	/**		/**
			* Export OVAL results into oscap_source
			* @param results_model The OVAL Results Model to export
			* @param directives_model The Directives Model to amend the export
			* @param filename A suggested name (filename) to assign with the oscap_sou
			rce
			* This name may later be used when storing the oscap_source to disk drive.
			* @returns Newly created oscap_source or NULL in case of failure
			*/
			struct oscap_source *oval_results_model_export_source(struct oval_results_m
			odel *results_model, struct oval_directives_model *directives_model, const
			char *name);
			/**
	* @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);
	/** @} */		/** @} */
	/**		/**
	* @name Getters		* @name Getters
	* @{		* @{
	*/		*/
End of changes. 6 change blocks.
	2 lines changed or deleted		33 lines changed or added

	oval_system_characteristics.h		oval_system_characteristics.h
	skipping to change at line 17		skipping to change at line 17
	*		*
	* Class diagram		* Class diagram
	* \image html system_characteristic.png		* \image html system_characteristic.png
	*		*
	* @file		* @file
	*		*
	* @author "David Niemoller" <David.Niemoller@g2-inc.com>		* @author "David Niemoller" <David.Niemoller@g2-inc.com>
	*/		*/
	/*		/*
	* Copyright 2009--2013 Red Hat Inc., Durham, North Carolina.		* Copyright 2009--2014 Red Hat Inc., Durham, North Carolina.
	* All Rights Reserved.		* All Rights Reserved.
	*		*
	* This library is free software; you can redistribute it and/or		* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public		* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either		* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.		* version 2.1 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	skipping to change at line 42		skipping to change at line 42
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A		* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*		*
	* Authors:		* Authors:
	* "David Niemoller" <David.Niemoller@g2-inc.com>		* "David Niemoller" <David.Niemoller@g2-inc.com>
	* Šimon Lukašík		* Šimon Lukašík
	*/		*/
	#ifndef OVAL_SYSTEM_CHARACTERISTICS		#ifndef OVAL_SYSTEM_CHARACTERISTICS
	#define OVAL_SYSTEM_CHARACTERISTICS		#define OVAL_SYSTEM_CHARACTERISTICS
			#include "oscap.h"
			#include "oscap_source.h"
	#include "oval_types.h"		#include "oval_types.h"
	#include "oval_definitions.h"		#include "oval_definitions.h"
	/// System characteristics result flag		/// System characteristics result flag
	typedef enum {		typedef enum {
	SYSCHAR_FLAG_UNKNOWN = 0,		SYSCHAR_FLAG_UNKNOWN = 0,
	SYSCHAR_FLAG_ERROR = 1,		SYSCHAR_FLAG_ERROR = 1,
	SYSCHAR_FLAG_COMPLETE = 2,		SYSCHAR_FLAG_COMPLETE = 2,
	SYSCHAR_FLAG_INCOMPLETE = 3,		SYSCHAR_FLAG_INCOMPLETE = 3,
	SYSCHAR_FLAG_DOES_NOT_EXIST = 4,		SYSCHAR_FLAG_DOES_NOT_EXIST = 4,
	skipping to change at line 188		skipping to change at line 190
	/**		/**
	* Create new oval_syschar_model.		* Create new oval_syschar_model.
	* The new model is bound to a specified oval_definition_model and variable bindings.		* The new model is bound to a specified oval_definition_model and variable bindings.
	* @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 oscap_source into an oval_syschar_model.
			* 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 source The oscap_source to import data from.
			* @return zero on success or non zero value if an error occurred
			* @memberof oval_syschar_model
			*/
			int oval_syschar_model_import_source(struct oval_syschar_model *model, stru
			ct oscap_source *source);
			/**
	* 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 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
			* @deprecated This function has been deprecated and it may be dropped from
			later
			* OpenSCAP releases. Please use oval_syschar_model_import_source instead.
			*
	*/		*/
	int oval_syschar_model_import(struct oval_syschar_model *model, const char *file);		OSCAP_DEPRECATED(int oval_syschar_model_import(struct oval_syschar_model *m odel, 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 *);
	/**		/**
	* Export system characteristics into file.		* Export system characteristics into file.
	* @memberof oval_syschar_model		* @memberof oval_syschar_model
	*/		*/
End of changes. 5 change blocks.
	2 lines changed or deleted		20 lines changed or added

	oval_variables.h		oval_variables.h
	skipping to change at line 15		skipping to change at line 15
	* Interface to Variable model		* Interface to Variable model
	* @{		* @{
	*		*
	* @file		* @file
	*		*
	* @author "David Niemoller" <David.Niemoller@g2-inc.com>		* @author "David Niemoller" <David.Niemoller@g2-inc.com>
	*		*
	*/		*/
	/*		/*
	* Copyright 2009-2010 Red Hat Inc., Durham, North Carolina.		* Copyright 2009-2014 Red Hat Inc., Durham, North Carolina.
	* All Rights Reserved.		* All Rights Reserved.
	*		*
	* This library is free software; you can redistribute it and/or		* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public		* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either		* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.		* version 2.1 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	skipping to change at line 40		skipping to change at line 40
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A		* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*		*
	* Authors:		* Authors:
	* "David Niemoller" <David.Niemoller@g2-inc.com>		* "David Niemoller" <David.Niemoller@g2-inc.com>
	*/		*/
	#ifndef OVAL_VARIABLES_H_		#ifndef OVAL_VARIABLES_H_
	#define OVAL_VARIABLES_H_		#define OVAL_VARIABLES_H_
	#include "oval_types.h"		#include "oval_types.h"
			#include "oscap.h"
			#include "oscap_source.h"
	/**		/**
	* Create a new empty OVAL variable model		* Create a new empty OVAL variable model
	* @memberof oval_variable_model		* @memberof oval_variable_model
	*/		*/
	struct oval_variable_model *oval_variable_model_new(void);		struct oval_variable_model *oval_variable_model_new(void);
			/**
			* Import the content from the oscap_source into a new oval_variable_model.
			* @param source The oscap_source to import from.
			* @return new oval_variable_model, or NULL if an error occurred
			* @memberof oval_variable_model
			*/
			struct oval_variable_model *oval_variable_model_import_source(struct oscap_
			source *source);
	/**		/**
	* Import the content from the file into a new oval_variable_model.		* Import the content from the file into a new oval_variable_model.
	* @param file filename		* @param file filename
	* @return new oval_variable_model, or NULL if an error occurred		* @return new oval_variable_model, or NULL if an error occurred
	* @memberof oval_variable_model		* @memberof oval_variable_model
			* @deprecated This function has been deprecated and it may be dropped from
			later
			* OpenSCAP releases. Please use oval_variable_model_import_source instead.
			*
	*/		*/
	struct oval_variable_model * oval_variable_model_import(const char *file);		OSCAP_DEPRECATED(struct oval_variable_model *oval_variable_model_import(con
			st char *file));
	/**		/**
	* Clone an OVAL variable model		* Clone an OVAL variable model
	* @return A copy of the specified @ref oval_variable_model.		* @return A copy of the specified @ref oval_variable_model.
	* @memberof oval_variable_model		* @memberof oval_variable_model
	*/		*/
	struct oval_variable_model *oval_variable_model_clone(struct oval_variable_ model *);		struct oval_variable_model *oval_variable_model_clone(struct oval_variable_ model *);
	/**		/**
	* Free memory allocated to a specified oval_variable_model		* Free memory allocated to a specified oval_variable_model
	* @param variable_model the specified oval_variable_model		* @param variable_model the specified oval_variable_model
	* @memberof oval_variable_model		* @memberof oval_variable_model
End of changes. 5 change blocks.
	2 lines changed or deleted		20 lines changed or added

	scap_ds.h		scap_ds.h
	/**		/**
	* @addtogroup DS		* @addtogroup DS
	* @{		* @{
	*		*
	* @file scap_ds.h		* @file scap_ds.h
	* Open-scap Data Stream interface.		* Open-scap Data Stream interface.
	* @author Martin Preisler <mpreisle@redhat.com>		* @author Martin Preisler <mpreisle@redhat.com>
	*/		*/
	/*		/*
	* Copyright 2012 Red Hat Inc., Durham, North Carolina.		* Copyright 2012--2014 Red Hat Inc., Durham, North Carolina.
	* All Rights Reserved.		* All Rights Reserved.
	*		*
	* This library is free software; you can redistribute it and/or		* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public		* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either		* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.		* version 2.1 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	skipping to change at line 68		skipping to change at line 68
	* Directory where the resulting files will be stored, names of the fil es		* Directory where the resulting files will be stored, names of the fil es
	* are deduced using component-refs inside the datastream.		* are deduced using component-refs inside the datastream.
	*		*
	* @param target_filename		* @param target_filename
	* Base name of the target XCCDF file, if NULL is given the filename wi ll		* Base name of the target XCCDF file, if NULL is given the filename wi ll
	* be deduced from the contents of the datastream.		* be deduced from the contents of the datastream.
	*		*
	* @returns		* @returns
	* 0 if no errors were encountered		* 0 if no errors were encountered
	* -1 in case of errors		* -1 in case of errors
			*
			* @deprecated This function has been deprecated. Make a use of ds_sds_sess
			ion
			* instread. This function may be dropped from later versions of the li
			brary.
	*/		*/
	int ds_sds_decompose(const char* input_file, const char* id, const char* xc		OSCAP_DEPRECATED(int ds_sds_decompose(const char* input_file, const char* i
	cdf_id,		d, const char* xccdf_id, const char* target_dir, const char* target_filenam
	const char* target_dir, const char* target_filename);		e));
	/**		/**
	* @brief same as ds_sds_decompose but works with other components than jus t XCCDFs		* @brief same as ds_sds_decompose but works with other components than jus t XCCDFs
	*		*
	* @param container component reference container such as "checklists", "ch ecks", ...		* @param container component reference container such as "checklists", "ch ecks", ...
	*		*
	* @param component_id		* @param component_id
	* id of the component you want to start the export from. If NU LL, all		* id of the component you want to start the export from. If NU LL, all
	* components refs inside given container will be exported.		* components refs inside given container will be exported.
	*		*
	* @param target_filename		* @param target_filename
	* Base name of the target file, if NULL is given the filename will		* Base name of the target file, if NULL is given the filename will
	* be deduced from the contents of the datastream.		* be deduced from the contents of the datastream.
	*		*
	* @see ds_sds_decompose		* @see ds_sds_decompose
			*
			* @deprecated This function has been deprecated. Make a use of ds_sds_sess
			ion
			* instread. This function may be dropped from later versions of the li
			brary.
	*/		*/
	int ds_sds_decompose_custom(const char* input_file, const char* id, const c		OSCAP_DEPRECATED(int ds_sds_decompose_custom(const char* input_file, const
	har* target_dir,		char* id, const char* target_dir, const char* container_name, const char* c
	const char* container_name, const char* component_id, const		omponent_id, const char* target_filename));
	char* target_filename);
	/**		/**
	* @brief takes given xccdf file and constructs a source datastream		* @brief takes given xccdf file and constructs a source datastream
	*		*
	* @param xccdf_file		* @param xccdf_file
	* Path to the XCCDF file that should be included in the datastream		* Path to the XCCDF file that should be included in the datastream
	* (including its dependencies).		* (including its dependencies).
	*		*
	* @param target_datastream		* @param target_datastream
	* ID of the datastream that should contain the XCCDF file. It will be		* ID of the datastream that should contain the XCCDF file. It will be
	skipping to change at line 125		skipping to change at line 129
	* ID of the datastream into which the component shall be added.		* ID of the datastream into which the component shall be added.
	* Null value indicates the very first datastream in the collection.		* Null value indicates the very first datastream in the collection.
	*		*
	* @param new_component		* @param new_component
	* Path to the new component file (XCCDF, OVAL, or CPE Dictionary).		* Path to the new component file (XCCDF, OVAL, or CPE Dictionary).
	*		*
	* @returns 0 in case of success		* @returns 0 in case of success
	*/		*/
	int ds_sds_compose_add_component(const char *target_datastream, const char *datastream_id, const char *new_component, bool extended);		int ds_sds_compose_add_component(const char *target_datastream, const char *datastream_id, const char *new_component, bool extended);
	int ds_rds_decompose(const char* input_file, const char* report_id, const c		/**
	har* request_id, const char* target_dir);		* @deprecated This function has been deprecated. Make a use of ds_rds_sess
			ion
			* instread. This function may be dropped from later versions of the librar
			y.
			*/
			OSCAP_DEPRECATED(int ds_rds_decompose(const char* input_file, const char* r
			eport_id, const char* request_id, const char* target_dir));
	/**		/**
	* @brief takes given source data stream and XCCDF result file and makes a result data stream		* @brief takes given source data stream and XCCDF result file and makes a result data stream
	*		*
	* @param sds_file		* @param sds_file
	* Path to the source data stream file that was used to generate the r esult XCCDF		* Path to the source data stream file that was used to generate the r esult XCCDF
	*		*
	* @param xccdf_result_file		* @param xccdf_result_file
	* Contains xccdf:TestResult(s) and the embedded Benchmark (optionally ).		* Contains xccdf:TestResult(s) and the embedded Benchmark (optionally ).
	* The embedded Benchmark (source data) will not be included in the re sult		* The embedded Benchmark (source data) will not be included in the re sult
	skipping to change at line 260		skipping to change at line 268
	* @brief retrieves all streams indexed inside this structure		* @brief retrieves all streams indexed inside this structure
	*		*
	* @memberof ds_sds_index		* @memberof ds_sds_index
	*/		*/
	struct ds_stream_index_iterator* ds_sds_index_get_streams(struct ds_sds_ind ex* s);		struct ds_stream_index_iterator* ds_sds_index_get_streams(struct ds_sds_ind ex* s);
	/**		/**
	* @brief imports given source datastream and indexes it		* @brief imports given source datastream and indexes it
	*		*
	* @memberof ds_sds_index		* @memberof ds_sds_index
			*
			* @deprecated This function has been deprecated. Make a use of ds_sds_sess
			ion
			* instread. This function may be dropped from later versions of the li
			brary.
	*/		*/
	struct ds_sds_index *ds_sds_index_import(const char* file);		OSCAP_DEPRECATED(struct ds_sds_index *ds_sds_index_import(const char* file) );
	/**		/**
	* @brief chooses datastream and checklist id combination given the IDs		* @brief chooses datastream and checklist id combination given the IDs
	*		*
	* @param datastream_id has to point to an allocated char*, selected datast ream ID will be filled into it		* @param datastream_id has to point to an allocated char*, selected datast ream ID will be filled into it
	* @param component_id has to point to an allocated char*, selected xccdf I D will be filled into it		* @param component_id has to point to an allocated char*, selected xccdf I D will be filled into it
	*		*
	* datastream_id and component_id must not point to the same memory! Howeve r,		* datastream_id and component_id must not point to the same memory! Howeve r,
	* the pointers pointed to may be NULL (which means any ID will do).		* the pointers pointed to may be NULL (which means any ID will do).
	*		*
	skipping to change at line 409		skipping to change at line 420
	/// @memberof rds_index		/// @memberof rds_index
	struct rds_report_index_iterator *rds_index_get_reports(struct rds_index *s );		struct rds_report_index_iterator *rds_index_get_reports(struct rds_index *s );
	/// @memberof rds_index		/// @memberof rds_index
	struct rds_report_request_index *rds_index_get_report_request(struct rds_in dex *rds, const char *id);		struct rds_report_request_index *rds_index_get_report_request(struct rds_in dex *rds, const char *id);
	/// @memberof rds_index		/// @memberof rds_index
	struct rds_asset_index *rds_index_get_asset(struct rds_index *rds, const ch ar *id);		struct rds_asset_index *rds_index_get_asset(struct rds_index *rds, const ch ar *id);
	/// @memberof rds_index		/// @memberof rds_index
	struct rds_report_index *rds_index_get_report(struct rds_index *rds, const char *id);		struct rds_report_index *rds_index_get_report(struct rds_index *rds, const char *id);
	/// @memberof rds_index		/**
	struct rds_index *rds_index_import(const char *file);		* @memberof rds_index
			* @deprecated This function has been deprecated. Make a use of ds_rds_sess
			ion
			* instread. This function may be dropped from later versions of the librar
			y.
			*/
			OSCAP_DEPRECATED(struct rds_index *rds_index_import(const char *file));
	/// @memberof rds_index		/// @memberof rds_index
	int rds_index_select_report(struct rds_index *s, const char **report_id);		int rds_index_select_report(struct rds_index *s, const char **report_id);
	/************************************************************/		/************************************************************/
	/** @} End of DS group */		/** @} End of DS group */
	#endif		#endif
End of changes. 9 change blocks.
	13 lines changed or deleted		39 lines changed or added

	xccdf_benchmark.h		xccdf_benchmark.h
	/**		/**
	* @addtogroup XCCDF		* @addtogroup XCCDF
	* @{		* @{
	*		*
	* @file xccdf_benchmark.h		* @file xccdf_benchmark.h
	* Open-scap XCCDF library interface.		* Open-scap XCCDF library interface.
	* @author Lukas Kuklinek <lkuklinek@redhat.com>		* @author Lukas Kuklinek <lkuklinek@redhat.com>
	*/		*/
	/*		/*
	* Copyright 2009 Red Hat Inc., Durham, North Carolina.		* Copyright 2009--2014 Red Hat Inc., Durham, North Carolina.
	* Copyright (C) 2010 Tresys Technology, LLC		* Copyright (C) 2010 Tresys Technology, LLC
	* All Rights Reserved.		* All Rights Reserved.
	*		*
	* This library is free software; you can redistribute it and/or		* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public		* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either		* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.		* version 2.1 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	skipping to change at line 40		skipping to change at line 40
	* Lukas Kuklinek <lkuklinek@redhat.com>		* Lukas Kuklinek <lkuklinek@redhat.com>
	* Josh Adams <jadams@tresys.com>		* Josh Adams <jadams@tresys.com>
	*/		*/
	#ifndef XCCDF_H_		#ifndef XCCDF_H_
	#define XCCDF_H_		#define XCCDF_H_
	#include <stdbool.h>		#include <stdbool.h>
	#include <time.h>		#include <time.h>
	#include <oscap_reference.h>		#include <oscap_reference.h>
			#include <oscap_source.h>
	#include <oscap.h>		#include <oscap.h>
	#include "cpe_dict.h"		#include "cpe_dict.h"
	/*--------------------*\		/*--------------------*\
	| Enumerations |		| Enumerations |
	\*--------------------*/		\*--------------------*/
	/**		/**
	* Type of an XCCDF object.		* Type of an XCCDF object.
	*		*
	skipping to change at line 639		skipping to change at line 640
	/// @memberof xccdf_version_info		/// @memberof xccdf_version_info
	const char* xccdf_version_info_get_namespace_uri(const struct xccdf_version _info* v);		const char* xccdf_version_info_get_namespace_uri(const struct xccdf_version _info* v);
	/// @memberof xccdf_version_info		/// @memberof xccdf_version_info
	const char* xccdf_version_info_get_cpe_version(const struct xccdf_version_i nfo* v);		const char* xccdf_version_info_get_cpe_version(const struct xccdf_version_i nfo* v);
	/**		/**
	* Starts parsing given XCCDF benchmark file to detect its version,		* Starts parsing given XCCDF benchmark file to detect its version,
	* stops as soon as the version is found. Returned string should be		* stops as soon as the version is found. Returned string should be
	* freed by caller. Return NULL if error occur.		* freed by caller. Return NULL if error occur.
	* @memberof xccdf_benchmark		* @memberof xccdf_benchmark
			* @deprecated This function has been deprecated by @ref oscap_source_get_s
			chema_version.
			* This function may be dropped from later versions of the library.
	*/		*/
	char * xccdf_detect_version(const char* file);		OSCAP_DEPRECATED(char * xccdf_detect_version(const char* file));
	/************************************************************/		/************************************************************/
	/// @memberof xccdf_item		/// @memberof xccdf_item
	void xccdf_item_free(struct xccdf_item *item);		void xccdf_item_free(struct xccdf_item *item);
	/// @memberof xccdf_item		/// @memberof xccdf_item
	struct xccdf_item * xccdf_item_clone(const struct xccdf_item * old_item);		struct xccdf_item * xccdf_item_clone(const struct xccdf_item * old_item);
	/**		/**
	skipping to change at line 704		skipping to change at line 707
	* @retval NULL on faliure (e.g. item is not a test result)		* @retval NULL on faliure (e.g. item is not a test result)
	*/		*/
	struct xccdf_result* xccdf_item_to_result(struct xccdf_item* item);		struct xccdf_result* xccdf_item_to_result(struct xccdf_item* item);
	/**		/**
	* Import the content from a specified XML stream into a benchmark.		* Import the content from a specified XML stream into a benchmark.
	* @memberof xccdf_benchmark		* @memberof xccdf_benchmark
	* @param file filename.		* @param file filename.
	* @return Pointer to the new benchmark.		* @return Pointer to the new benchmark.
	* @retval NULL on failure		* @retval NULL on failure
			* @deprecated This function has been deprecated by @ref xccdf_benchmark_im
			port_source.
			* This function may be dropped from later versions of the library.
	*/		*/
	struct xccdf_benchmark* xccdf_benchmark_import(const char *file);		OSCAP_DEPRECATED(struct xccdf_benchmark* xccdf_benchmark_import(const char
			*file));
			/**
			* Import the content from oscap_source into a benchmark
			* @memberof xccdf_benchmark
			* @param source The oscap_source to import from
			* @returns newly created benchmark element or NULL
			*/
			struct xccdf_benchmark* xccdf_benchmark_import_source(struct oscap_source *
			source);
	/**		/**
	* Export a benchmark to an XML stream		* Export a benchmark to an XML stream
	* @memberof xccdf_benchmark		* @memberof xccdf_benchmark
	* @return Integer		* @return Integer
	* @retval -1 if error occurred		* @retval -1 if error occurred
	*/		*/
	int xccdf_benchmark_export(struct xccdf_benchmark *benchmark, const char *f ile);		int xccdf_benchmark_export(struct xccdf_benchmark *benchmark, const char *f ile);
	/**		/**
			* Import the content of oscap_source into a xccdf_result
			* @memberof xccdf_result
			* @param source The oscap_source to import from
			* @returns newly created test-result element or NULL on error
			*/
			struct xccdf_result *xccdf_result_import_source(struct oscap_source *source
			);
			/**
	* Collect system info and store it in the TestResult.		* Collect system info and store it in the TestResult.
	* @memberof xccdf_result		* @memberof xccdf_result
	*/		*/
	void xccdf_result_fill_sysinfo(struct xccdf_result *result);		void xccdf_result_fill_sysinfo(struct xccdf_result *result);
	/**		/**
	* Export a TestResult to an XML stream		* Export a TestResult to an XML stream
	* @memberof xccdf_result		* @memberof xccdf_result
	* @return Integer		* @return Integer
	* @retval -1 if error occurred		* @retval -1 if error occurred
			* @deprecated This function has been deprecated by @ref xccdf_benchmark_ex
			port_source.
			* This function may be dropped from later versions of the library.
			*/
			OSCAP_DEPRECATED(int xccdf_result_export(struct xccdf_result *result, const
			char *file));
			/**
			* Export TestResult to oscap_source structure
			* @memberof xccdf_result
			* @returns newly created oscap_source or NULL on error
	*/		*/
	int xccdf_result_export(struct xccdf_result *result, const char *file);		struct oscap_source *xccdf_result_export_source(struct xccdf_result *result , const char *filepath);
	/**		/**
	* Resolve an benchmark.		* Resolve an benchmark.
	* @returns whether the resolving process has been successful		* @returns whether the resolving process has been successful
	* @retval true on success		* @retval true on success
	* @retval false on dependency loop		* @retval false on dependency loop
	*/		*/
	bool xccdf_benchmark_resolve(struct xccdf_benchmark *benchmark);		bool xccdf_benchmark_resolve(struct xccdf_benchmark *benchmark);
	/// @memberof xccdf_benchmark		/// @memberof xccdf_benchmark
	skipping to change at line 2533		skipping to change at line 2563
	struct xccdf_rule_result_iterator *xccdf_result_get_rule_results(const stru ct xccdf_result *item);		struct xccdf_rule_result_iterator *xccdf_result_get_rule_results(const stru ct xccdf_result *item);
	/// @memberof xccdf_result		/// @memberof xccdf_result
	struct xccdf_score_iterator *xccdf_result_get_scores(const struct xccdf_res ult *item);		struct xccdf_score_iterator *xccdf_result_get_scores(const struct xccdf_res ult *item);
	/// @memberof xccdf_result		/// @memberof xccdf_result
	const char * xccdf_result_get_start_time(const struct xccdf_result *item);		const char * xccdf_result_get_start_time(const struct xccdf_result *item);
	/// @memberof xccdf_result		/// @memberof xccdf_result
	const char * xccdf_result_get_end_time(const struct xccdf_result *item);		const char * xccdf_result_get_end_time(const struct xccdf_result *item);
	/// @memberof xccdf_result		/// @memberof xccdf_result
	struct oscap_string_iterator *xccdf_result_get_metadata(const struct xccdf_ result *result);		struct oscap_string_iterator *xccdf_result_get_metadata(const struct xccdf_ result *result);
			/**
			* Override the result of rule-result.
			* @memberof xccdf_rule_result
			* @param rule_result The rule-result element to override
			* @param new_result to set
			* @param time The time of override
			* @param authority identifier of person overriding the result
			* @param remark Rationale of the override
			* @returns true on success
			*/
			bool xccdf_rule_result_override(struct xccdf_rule_result *rule_result, xccd
			f_test_result_type_t new_result, const char *time, const char *authority, s
			truct oscap_text *remark);
	/// @memberof xccdf_rule_result		/// @memberof xccdf_rule_result
	const char * xccdf_rule_result_get_time(const struct xccdf_rule_result *ite m);		const char * xccdf_rule_result_get_time(const struct xccdf_rule_result *ite m);
	/// @memberof xccdf_rule_result		/// @memberof xccdf_rule_result
	xccdf_role_t xccdf_rule_result_get_role(const struct xccdf_rule_result *ite m);		xccdf_role_t xccdf_rule_result_get_role(const struct xccdf_rule_result *ite m);
	/// @memberof xccdf_rule_result		/// @memberof xccdf_rule_result
	float xccdf_rule_result_get_weight(const struct xccdf_rule_result *item);		float xccdf_rule_result_get_weight(const struct xccdf_rule_result *item);
	/// @memberof xccdf_rule_result		/// @memberof xccdf_rule_result
	xccdf_level_t xccdf_rule_result_get_severity(const struct xccdf_rule_result *item);		xccdf_level_t xccdf_rule_result_get_severity(const struct xccdf_rule_result *item);
	/// @memberof xccdf_rule_result		/// @memberof xccdf_rule_result
	xccdf_test_result_type_t xccdf_rule_result_get_result(const struct xccdf_ru le_result *item);		xccdf_test_result_type_t xccdf_rule_result_get_result(const struct xccdf_ru le_result *item);
	skipping to change at line 2606		skipping to change at line 2648
	const char *xccdf_target_identifier_get_href(const struct xccdf_target_iden tifier *item);		const char *xccdf_target_identifier_get_href(const struct xccdf_target_iden tifier *item);
	/// @memberof xccdf_target_identifier		/// @memberof xccdf_target_identifier
	const char *xccdf_target_identifier_get_name(const struct xccdf_target_iden tifier *item);		const char *xccdf_target_identifier_get_name(const struct xccdf_target_iden tifier *item);
	/// @memberof xccdf_instance		/// @memberof xccdf_instance
	const char *xccdf_instance_get_context(const struct xccdf_instance *item);		const char *xccdf_instance_get_context(const struct xccdf_instance *item);
	/// @memberof xccdf_instance		/// @memberof xccdf_instance
	const char *xccdf_instance_get_parent_context(const struct xccdf_instance * item);		const char *xccdf_instance_get_parent_context(const struct xccdf_instance * item);
	/// @memberof xccdf_instance		/// @memberof xccdf_instance
	const char *xccdf_instance_get_content(const struct xccdf_instance *item);		const char *xccdf_instance_get_content(const struct xccdf_instance *item);
	/// @memberof xccdf_tailoring		/// @memberof xccdf_tailoring
	struct xccdf_tailoring *xccdf_tailoring_import(const char *file, struct xcc		struct xccdf_tailoring *xccdf_tailoring_import_source(struct oscap_source *
	df_benchmark *benchmark);		source, struct xccdf_benchmark *benchmark);
			/*
			* @memberof xccdf_tailoring
			* @deprecated This function has been deprecated by @ref xccdf_tailoring_im
			port_source.
			* This function may be dropped from later versions of the library.
			*/
			OSCAP_DEPRECATED(struct xccdf_tailoring *xccdf_tailoring_import(const char
			*file, struct xccdf_benchmark *benchmark));
	/// @memberof xccdf_tailoring		/// @memberof xccdf_tailoring
	const char *xccdf_tailoring_get_id(const struct xccdf_tailoring *tailoring) ;		const char *xccdf_tailoring_get_id(const struct xccdf_tailoring *tailoring) ;
	/// @memberof xccdf_tailoring		/// @memberof xccdf_tailoring
	const char *xccdf_tailoring_get_version(const struct xccdf_tailoring *tailo ring);		const char *xccdf_tailoring_get_version(const struct xccdf_tailoring *tailo ring);
	/// @memberof xccdf_tailoring		/// @memberof xccdf_tailoring
	const char *xccdf_tailoring_get_version_update(const struct xccdf_tailoring *tailoring);		const char *xccdf_tailoring_get_version_update(const struct xccdf_tailoring *tailoring);
	/// @memberof xccdf_tailoring		/// @memberof xccdf_tailoring
	const char *xccdf_tailoring_get_version_time(const struct xccdf_tailoring * tailoring);		const char *xccdf_tailoring_get_version_time(const struct xccdf_tailoring * tailoring);
	/// @memberof xccdf_tailoring		/// @memberof xccdf_tailoring
	const char *xccdf_tailoring_get_benchmark_ref(const struct xccdf_tailoring *tailoring);		const char *xccdf_tailoring_get_benchmark_ref(const struct xccdf_tailoring *tailoring);
	skipping to change at line 3221		skipping to change at line 3270
	/// @memberof xccdf_result		/// @memberof xccdf_result
	bool xccdf_result_add_identity(struct xccdf_result *item, struct xccdf_iden tity *newval);		bool xccdf_result_add_identity(struct xccdf_result *item, struct xccdf_iden tity *newval);
	/// @memberof xccdf_result		/// @memberof xccdf_result
	bool xccdf_result_add_score(struct xccdf_result *item, struct xccdf_score * newval);		bool xccdf_result_add_score(struct xccdf_result *item, struct xccdf_score * newval);
	/// @memberof xccdf_result		/// @memberof xccdf_result
	bool xccdf_result_add_title(struct xccdf_result *item, struct oscap_text *n ewval);		bool xccdf_result_add_title(struct xccdf_result *item, struct oscap_text *n ewval);
	/// @memberof xccdf_result		/// @memberof xccdf_result
	bool xccdf_result_add_target_address(struct xccdf_result *item, const char *newval);		bool xccdf_result_add_target_address(struct xccdf_result *item, const char *newval);
	/// @memberof xccdf_result		/// @memberof xccdf_result
	bool xccdf_result_add_applicable_platform(struct xccdf_result *item, const char *newval);		bool xccdf_result_add_applicable_platform(struct xccdf_result *item, const char *newval);
			/// @memberof xccdf_result
			int xccdf_result_recalculate_scores(struct xccdf_result *result, struct xcc
			df_item *benchmark);
	/// @memberof xccdf_rule_result		/// @memberof xccdf_rule_result
	bool xccdf_rule_result_add_ident(struct xccdf_rule_result *obj, struct xccd f_ident *item);		bool xccdf_rule_result_add_ident(struct xccdf_rule_result *obj, struct xccd f_ident *item);
	/// @memberof xccdf_rule_result		/// @memberof xccdf_rule_result
	bool xccdf_rule_result_add_fix(struct xccdf_rule_result *obj, struct xccdf_ fix *item);		bool xccdf_rule_result_add_fix(struct xccdf_rule_result *obj, struct xccdf_ fix *item);
	/// @memberof xccdf_rule_result		/// @memberof xccdf_rule_result
	bool xccdf_rule_result_add_check(struct xccdf_rule_result *obj, struct xccd f_check *item);		bool xccdf_rule_result_add_check(struct xccdf_rule_result *obj, struct xccd f_check *item);
	/// @memberof xccdf_rule_result		/// @memberof xccdf_rule_result
	bool xccdf_rule_result_add_override(struct xccdf_rule_result *obj, struct x ccdf_override *item);		bool xccdf_rule_result_add_override(struct xccdf_rule_result *obj, struct x ccdf_override *item);
	/// @memberof xccdf_rule_result		/// @memberof xccdf_rule_result
	bool xccdf_rule_result_add_message(struct xccdf_rule_result *obj, struct xc cdf_message *item);		bool xccdf_rule_result_add_message(struct xccdf_rule_result *obj, struct xc cdf_message *item);
End of changes. 12 change blocks.
	6 lines changed or deleted		69 lines changed or added

	xccdf_policy.h		xccdf_policy.h
	skipping to change at line 195		skipping to change at line 195
	* @param item XCCDF Item to query description from		* @param item XCCDF Item to query description from
	* @param preferred_lang Language of your choice, Null value for the defaul t.		* @param preferred_lang Language of your choice, Null value for the defaul t.
	* @returns plaintext C string which must be freed by caller		* @returns plaintext C string which must be freed by caller
	*/		*/
	char *xccdf_policy_get_readable_item_description(struct xccdf_policy *polic y, struct xccdf_item *item, const char *preferred_lang);		char *xccdf_policy_get_readable_item_description(struct xccdf_policy *polic y, struct xccdf_item *item, const char *preferred_lang);
	/**		/**
	* Registers an additional CPE dictionary for applicability testing		* Registers an additional CPE dictionary for applicability testing
	* The one embedded in the evaluated XCCDF take precedence!		* The one embedded in the evaluated XCCDF take precedence!
	*/		*/
			bool xccdf_policy_model_add_cpe_dict_source(struct xccdf_policy_model * mod
			el, struct oscap_source *source);
			/**
			* Registers an additional CPE dictionary for applicability testing
			* The one embedded in the evaluated XCCDF take precedence!
			*
			* @deprecated Deprecated in favor of @ref xccdf_policy_model_add_cpe_dict_
			source
			*/
	bool xccdf_policy_model_add_cpe_dict(struct xccdf_policy_model * model, con st char * cpe_dict);		bool xccdf_policy_model_add_cpe_dict(struct xccdf_policy_model * model, con st char * cpe_dict);
	/**		/**
	* Registers an additional CPE lang model for applicability testing		* Registers an additional CPE lang model for applicability testing
	* The one embedded in the evaluated XCCDF take precedence!		* The one embedded in the evaluated XCCDF take precedence!
	*/		*/
	bool xccdf_policy_model_add_cpe_lang_model(struct xccdf_policy_model * mode		bool xccdf_policy_model_add_cpe_lang_model_source(struct xccdf_policy_model
	l, const char * cpe_lang);		* model, struct oscap_source *source);
			/**
			* Registers an additional CPE lang model for applicability testing
			* The one embedded in the evaluated XCCDF take precedence!
			*
			* @deprecated Deprecated in favor of @ref xccdf_policy_model_add_cpe_lang_
			model_source
			*/
			OSCAP_DEPRECATED(bool xccdf_policy_model_add_cpe_lang_model(struct xccdf_po
			licy_model * model, const char *cpe_lang));
			/**
			* Registers an additional CPE resource (either dictionary or language)
			* Autodetects given file and acts accordingly.
			* The one embedded in the evaluated XCCDF take precedence!
			*/
			bool xccdf_policy_model_add_cpe_autodetect_source(struct xccdf_policy_model
			*model, struct oscap_source *source);
	/**		/**
	* Registers an additional CPE resource (either dictionary or language)		* Registers an additional CPE resource (either dictionary or language)
	* Autodetects given file and acts accordingly.		* Autodetects given file and acts accordingly.
	* The one embedded in the evaluated XCCDF take precedence!		* The one embedded in the evaluated XCCDF take precedence!
			*
			* @deprecated Deprecated in favor of @ref xccdf_policy_model_add_cpe_autod
			etect_source
	*/		*/
	bool xccdf_policy_model_add_cpe_autodetect(struct xccdf_policy_model *model , const char* filepath);		OSCAP_DEPRECATED(bool xccdf_policy_model_add_cpe_autodetect(struct xccdf_po licy_model *model, const char *filepath));
	/**		/**
	* Retrieves an iterator of all OVAL sessions created for CPE applicability evaluation		* Retrieves an iterator of all OVAL sessions created for CPE applicability evaluation
	* key is the OVAL href, value is the OVAL session itself (type oval_agent_ session*)		* key is the OVAL href, value is the OVAL session itself (type oval_agent_ session*)
	*/		*/
	struct oscap_htable_iterator *xccdf_policy_model_get_cpe_oval_sessions(stru ct xccdf_policy_model *model);		struct oscap_htable_iterator *xccdf_policy_model_get_cpe_oval_sessions(stru ct xccdf_policy_model *model);
	/**		/**
	* Function to register callback for checking system		* Function to register callback for checking system
	* @param model XCCDF Policy Model		* @param model XCCDF Policy Model
End of changes. 4 change blocks.
	3 lines changed or deleted		34 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/