From 6389bbbf58d07615b778d3a0ed98d2afe7e39546 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Mon, 6 Apr 2009 09:52:21 +0200 Subject: [PATCH] Changed freshly introduced iso_file_get_external_filter() to iso_stream_get_external_filter(). --- libisofs/filters/external.c | 6 ++---- libisofs/libisofs.h | 17 +++++++++-------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/libisofs/filters/external.c b/libisofs/filters/external.c index 79c3266..0821668 100644 --- a/libisofs/filters/external.c +++ b/libisofs/filters/external.c @@ -757,13 +757,11 @@ int iso_file_add_external_filter(IsoFile *file, IsoExternalFilterCommand *cmd, } -int iso_file_get_external_filter(IsoFile *file, IsoExternalFilterCommand **cmd, - int flag) +int iso_stream_get_external_filter(IsoStream *stream, + IsoExternalFilterCommand **cmd, int flag) { - IsoStream *stream; ExternalFilterStreamData *data; - stream = iso_file_get_stream(file); if (stream->class != &extf_stream_class) return 0; data = stream->data; diff --git a/libisofs/libisofs.h b/libisofs/libisofs.h index 421339e..6069ec4 100644 --- a/libisofs/libisofs.h +++ b/libisofs/libisofs.h @@ -4743,7 +4743,7 @@ struct iso_external_filter_command * not smaller than the number of input blocks. Block size is 2048. * Assume that non-empty input yields non-empty output and thus do * not attempt to attach a filter to files smaller than 2049 bytes. - * bit3= suffix was removed rather than to be added. + * bit3= suffix removed rather than added. * (Removal and adding suffixes is the task of the application. * This behavior bit serves only as reminder for the application.) */ @@ -4811,23 +4811,24 @@ int iso_file_remove_filter(IsoFile *file, int flag); /* ts A90402 */ /** - * Obtain the IsoExternalFilterCommand which is associated with the top filter - * stream from a data file. - * @param file - * The data file node which shall show filtered content. + * Obtain the IsoExternalFilterCommand which is eventually associated with the + * given stream. (Typically obtained from an IsoFile by iso_file_get_stream() + * or from an IsoStream by iso_stream_get_input_stream()). + * @param stream + * The stream to be inquired. * @param cmd * Will return the external IsoExternalFilterCommand. This does not * increment .refcount. * @param flag * Bitfield for control purposes, unused yet, submit 0. * @return - * 1 on success, 0 if the top stream of the file is not an external filter + * 1 on success, 0 if the stream is not an external filter * <0 on error * * @since 0.6.18 */ -int iso_file_get_external_filter(IsoFile *file, IsoExternalFilterCommand **cmd, - int flag); +int iso_stream_get_external_filter(IsoStream *stream, + IsoExternalFilterCommand **cmd, int flag); /* ------------------------------------------------------------------------- */