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

archive_plugin: use GError in the open() method

Browse Source
This commit is contained in:
Max Kellermann
2009-12-16 16:40:22 +01:00
parent f9af1a445e
commit 71fee09744
7 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/archive/bz2_archive_plugin.c
View File

@@ -98,7 +98,7 @@ bz2_destroy(struct bz2_archive_file *data)
/* archive open && listing routine */
static struct archive_file *
bz2_open(const char *pathname)
bz2_open(const char *pathname, GError **error_r)
{
struct bz2_archive_file *context;
int len;
@@ -107,8 +107,7 @@ bz2_open(const char *pathname)
archive_file_init(&context->base, &bz2_archive_plugin);
//open archive
if (!input_stream_open(&context->istream, pathname, NULL)) {
g_warning("failed to open an bzip2 archive %s\n",pathname);
if (!input_stream_open(&context->istream, pathname, error_r)) {
g_free(context);
return NULL;
}

5
src/archive/iso9660_archive_plugin.c
View File

@@ -90,7 +90,7 @@ listdir_recur(const char *psz_path, struct iso9660_archive_file *context)
}
static struct archive_file *
iso9660_archive_open(const char *pathname)
iso9660_archive_open(const char *pathname, GError **error_r)
{
struct iso9660_archive_file *context =
g_new(struct iso9660_archive_file, 1);
@@ -102,7 +102,8 @@ iso9660_archive_open(const char *pathname)
/* open archive */
context->iso = iso9660_open (pathname);
if (context->iso == NULL) {
g_warning("iso %s open failed\n", pathname);
g_set_error(error_r, iso9660_quark(), 0,
"Failed to open ISO9660 file %s", pathname);
return NULL;
}

5
src/archive/zzip_archive_plugin.c
View File

@@ -52,7 +52,7 @@ zzip_quark(void)
/* archive open && listing routine */
static struct archive_file *
zzip_archive_open(const char *pathname)
zzip_archive_open(const char *pathname, GError **error_r)
{
struct zzip_archive *context = g_malloc(sizeof(*context));
ZZIP_DIRENT dirent;
@@ -63,7 +63,8 @@ zzip_archive_open(const char *pathname)
context->list = NULL;
context->dir = zzip_dir_open(pathname, NULL);
if (context->dir == NULL) {
g_warning("zipfile %s open failed\n", pathname);
g_set_error(error_r, zzip_quark(), 0,
"Failed to open ZIP file %s", pathname);
return NULL;
}