oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

archive: use reference counting for archive+input

Browse Source 
Make the input_stream implementation hold a reference on the
archive_file object.  Allow the caller to "close" the archive_file
object immediately, no matter if the open_stream() method has
succeeded or not.
This commit is contained in:
Max Kellermann
2009-12-31 10:02:55 +01:00
parent 032c5376ad
commit aad05fd138
5 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/archive/iso9660_archive_plugin.c
View File

@@ -25,6 +25,7 @@
#include "archive/iso9660_archive_plugin.h"
#include "archive_api.h"
#include "input_plugin.h"
#include "refcount.h"
#include <cdio/cdio.h>
#include <cdio/iso9660.h>
@@ -37,6 +38,8 @@
struct iso9660_archive_file {
struct archive_file base;
struct refcount ref;
iso9660_t *iso;
GSList *list;
GSList *iter;
@@ -93,6 +96,7 @@ iso9660_archive_open(const char *pathname, GError **error_r)
g_new(struct iso9660_archive_file, 1);
archive_file_init(&context->base, &iso9660_archive_plugin);
refcount_init(&context->ref);
context->list = NULL;
@@ -139,8 +143,11 @@ iso9660_archive_close(struct archive_file *file)
{
struct iso9660_archive_file *context =
(struct iso9660_archive_file *)file;
GSList *tmp;
if (!refcount_dec(&context->ref))
return;
if (context->list) {
//free list
for (tmp = context->list; tmp != NULL; tmp = g_slist_next(tmp))
@@ -192,6 +199,9 @@ iso9660_archive_open_stream(struct archive_file *file, struct input_stream *is,
is->size = iis->statbuf->size;
iis->max_blocks = CEILING(iis->statbuf->size, ISO_BLOCKSIZE);
refcount_inc(&context->ref);
return true;
}