scap_ds.h   scap_ds.h 
skipping to change at line 125 skipping to change at line 125
* 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);
/** /**
* @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
* data stream, we will instead bundle the source data stream. * data stream, we will instead bundle the source data stream.
skipping to change at line 286 skipping to change at line 288
*/ */
struct ds_stream_index_iterator; struct ds_stream_index_iterator;
/// @memberof ds_stream_index_iterator /// @memberof ds_stream_index_iterator
struct ds_stream_index *ds_stream_index_iterator_next(struct ds_stream_inde x_iterator *it); struct ds_stream_index *ds_stream_index_iterator_next(struct ds_stream_inde x_iterator *it);
/// @memberof ds_stream_index_iterator /// @memberof ds_stream_index_iterator
bool ds_stream_index_iterator_has_more(struct ds_stream_index_iterator *it) ; bool ds_stream_index_iterator_has_more(struct ds_stream_index_iterator *it) ;
/// @memberof ds_stream_index_iterator /// @memberof ds_stream_index_iterator
void ds_stream_index_iterator_free(struct ds_stream_index_iterator *it); void ds_stream_index_iterator_free(struct ds_stream_index_iterator *it);
/**
* @struct rds_report_request_index
*/
struct rds_report_request_index;
struct rds_report_request_index* rds_report_request_index_new(void);
void rds_report_request_index_free(struct rds_report_request_index* s);
const char* rds_report_request_index_get_id(struct rds_report_request_index
* s);
/**
* @struct rds_asset_index
*/
struct rds_asset_index;
/**
* @struct rds_report_index
*/
struct rds_report_index;
struct rds_asset_index* rds_asset_index_new(void);
void rds_asset_index_free(struct rds_asset_index* s);
const char* rds_asset_index_get_id(struct rds_asset_index* s);
void rds_asset_index_add_report_ref(struct rds_asset_index* s, struct rds_r
eport_index* report);
struct rds_report_index_iterator* rds_asset_index_get_reports(struct rds_as
set_index* s);
struct rds_report_index* rds_report_index_new(void);
void rds_report_index_free(struct rds_report_index* s);
const char* rds_report_index_get_id(struct rds_report_index* s);
void rds_report_index_set_request(struct rds_report_index* s, struct rds_re
port_request_index *request);
struct rds_report_request_index *rds_report_index_get_request(struct rds_re
port_index* s);
/**
* @struct rds_report_request_index_iterator
* @see oscap_iterator
*/
struct rds_report_request_index_iterator;
/// @memberof rds_report_request_index_iterator
struct rds_report_request_index *rds_report_request_index_iterator_next(str
uct rds_report_request_index_iterator *it);
/// @memberof rds_report_request_index_iterator
bool rds_report_request_index_iterator_has_more(struct rds_report_request_i
ndex_iterator *it);
/// @memberof rds_report_request_index_iterator
void rds_report_request_index_iterator_free(struct rds_report_request_index
_iterator *it);
/**
* @struct rds_asset_index_iterator
* @see oscap_iterator
*/
struct rds_asset_index_iterator;
/// @memberof rds_asset_index_iterator
struct rds_asset_index *rds_asset_index_iterator_next(struct rds_asset_inde
x_iterator *it);
/// @memberof rds_asset_index_iterator
bool rds_asset_index_iterator_has_more(struct rds_asset_index_iterator *it)
;
/// @memberof rds_asset_index_iterator
void rds_asset_index_iterator_free(struct rds_asset_index_iterator *it);
/**
* @struct rds_report_index_iterator
* @see oscap_iterator
*/
struct rds_report_index_iterator;
/// @memberof rds_report_index_iterator
struct rds_report_index *rds_report_index_iterator_next(struct rds_report_i
ndex_iterator *it);
/// @memberof rds_report_index_iterator
bool rds_report_index_iterator_has_more(struct rds_report_index_iterator *i
t);
/// @memberof rds_report_index_iterator
void rds_report_index_iterator_free(struct rds_report_index_iterator *it);
/**
* @struct rds_index
*
* Represents <asset-report-collection> element - the root element of each
* result datastream in Asset Reporting Format = ARF.
*
* Indexes assets and report-requests.
*/
struct rds_index;
/// @memberof rds_index
struct rds_index* rds_index_new(void);
/// @memberof rds_index
void rds_index_free(struct rds_index *s);
/// @memberof rds_index
struct rds_report_request_index_iterator *rds_index_get_report_requests(str
uct rds_index *s);
/// @memberof rds_index
struct rds_asset_index_iterator *rds_index_get_assets(struct rds_index *s);
/// @memberof rds_index
struct rds_report_index_iterator *rds_index_get_reports(struct rds_index *s
);
/// @memberof rds_index
struct rds_report_request_index *rds_index_get_report_request(struct rds_in
dex *rds, const char *id);
/// @memberof rds_index
struct rds_asset_index *rds_index_get_asset(struct rds_index *rds, const ch
ar *id);
/// @memberof rds_index
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
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. 2 change blocks. 
0 lines changed or deleted 125 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/