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

Merge branch 'v0.15.x'

Browse Source 
Conflicts:
	src/archive/bz2_plugin.c
	src/archive_api.h
	src/input/file_input_plugin.c
	test/run_input.c
This commit is contained in:
Max Kellermann
2009-12-15 20:26:38 +01:00
parent 95c3f283ea 9179f108a5
commit 530e480748
7 changed files with 89 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/archive/bz2_plugin.c
View File

@@ -144,8 +144,7 @@ bz2_close(struct archive_file *file)
{
bz2_context *context = (bz2_context *) file;
if (context->name)
g_free(context->name);
g_free(context->name);
input_stream_close(&context->istream);
g_free(context);
@@ -179,6 +178,8 @@ bz2_is_close(struct input_stream *is)
bz2_context *context = (bz2_context *) is->data;
bz2_destroy(context);
is->data = NULL;
bz2_close((struct archive_file *)context);
}
static bool

5
src/archive/iso_plugin.c
View File

@@ -133,7 +133,8 @@ iso_close(struct archive_file *file)
}
//close archive
iso9660_close(context->iso);
context->iso = NULL;
g_free(context);
}
/* single archive handling */
@@ -166,6 +167,8 @@ iso_is_close(struct input_stream *is)
{
iso_context *context = (iso_context *) is->data;
g_free(context->statbuf);
iso_close((struct archive_file *)context);
}

5
src/archive/zip_plugin.c
View File

@@ -100,7 +100,8 @@ zip_close(struct archive_file *file)
}
//close archive
zzip_dir_close (context->dir);
context->dir = NULL;
g_free(context);
}
/* single archive handling */
@@ -134,6 +135,8 @@ zip_is_close(struct input_stream *is)
{
zip_context *context = (zip_context *) is->data;
zzip_file_close (context->file);
zip_close((struct archive_file *)context);
}
static size_t