ArchivePlugin: scan_next() returns const string

This commit is contained in:
Max Kellermann
2013-01-29 21:11:04 +01:00
parent e66005563e
commit a42f9fd4e2
6 changed files with 18 additions and 16 deletions

View File

@@ -158,11 +158,11 @@ bz2_scan_reset(struct archive_file *file)
context->reset = true;
}
static char *
static const char *
bz2_scan_next(struct archive_file *file)
{
Bzip2ArchiveFile *context = (Bzip2ArchiveFile *) file;
char *name = NULL;
const char *name = NULL;
if (context->reset) {
name = context->name;

View File

@@ -141,16 +141,16 @@ iso9660_archive_scan_reset(struct archive_file *file)
context->iter = context->list;
}
static char *
static const char *
iso9660_archive_scan_next(struct archive_file *file)
{
Iso9660ArchiveFile *context =
(Iso9660ArchiveFile *)file;
char *data = NULL;
const char *data = NULL;
if (context->iter != NULL) {
///fetch data and goto next
data = (char *)context->iter->data;
data = (const char *)context->iter->data;
context->iter = g_slist_next(context->iter);
}
return data;

View File

@@ -109,14 +109,14 @@ zzip_archive_scan_reset(struct archive_file *file)
context->iter = context->list;
}
static char *
static const char *
zzip_archive_scan_next(struct archive_file *file)
{
ZzipArchiveFile *context = (ZzipArchiveFile *) file;
char *data = NULL;
const char *data = NULL;
if (context->iter != NULL) {
///fetch data and goto next
data = (char *)context->iter->data;
data = (const char *)context->iter->data;
context->iter = g_slist_next(context->iter);
}
return data;