diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-29 21:11:04 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-29 21:11:04 +0100 |
| commit | a42f9fd4e2ccb164c0634571da9903e6a2aa507a (patch) | |
| tree | 104cd2ac6598f1529f03e18c8f77135998b1a55d /src/archive | |
| parent | e66005563efb24cdeb0c034a680f6a5556265c09 (diff) | |
ArchivePlugin: scan_next() returns const string
Diffstat (limited to 'src/archive')
| -rw-r--r-- | src/archive/Bzip2ArchivePlugin.cxx | 4 | ||||
| -rw-r--r-- | src/archive/Iso9660ArchivePlugin.cxx | 6 | ||||
| -rw-r--r-- | src/archive/ZzipArchivePlugin.cxx | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/archive/Bzip2ArchivePlugin.cxx b/src/archive/Bzip2ArchivePlugin.cxx index b344f118..4b0d5223 100644 --- a/src/archive/Bzip2ArchivePlugin.cxx +++ b/src/archive/Bzip2ArchivePlugin.cxx @@ -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; diff --git a/src/archive/Iso9660ArchivePlugin.cxx b/src/archive/Iso9660ArchivePlugin.cxx index f92895b7..fe752ff3 100644 --- a/src/archive/Iso9660ArchivePlugin.cxx +++ b/src/archive/Iso9660ArchivePlugin.cxx @@ -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; diff --git a/src/archive/ZzipArchivePlugin.cxx b/src/archive/ZzipArchivePlugin.cxx index dabdd41d..81bf91f0 100644 --- a/src/archive/ZzipArchivePlugin.cxx +++ b/src/archive/ZzipArchivePlugin.cxx @@ -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; |