From cf5b117553307fadad380d6b44dab0599683a077 Mon Sep 17 00:00:00 2001 From: Kevin Mitchell Date: Fri, 6 Nov 2015 19:23:00 -0800 Subject: libarchive: remove redundant log prefix "libarchive:" is already added by the logging system --- demux/demux_libarchive.c | 2 +- stream/stream_libarchive.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/demux/demux_libarchive.c b/demux/demux_libarchive.c index 1ce8b32244..3f1a655726 100644 --- a/demux/demux_libarchive.c +++ b/demux/demux_libarchive.c @@ -71,7 +71,7 @@ static int open_file(struct demuxer *demuxer, enum demux_check check) if (r == ARCHIVE_EOF) break; if (r < ARCHIVE_OK) - MP_ERR(demuxer, "libarchive: %s\n", archive_error_string(mpa->arch)); + MP_ERR(demuxer, "%s\n", archive_error_string(mpa->arch)); if (r < ARCHIVE_WARN) break; if (archive_entry_filetype(entry) != AE_IFREG) diff --git a/stream/stream_libarchive.c b/stream/stream_libarchive.c index 116488d551..21e1111671 100644 --- a/stream/stream_libarchive.c +++ b/stream/stream_libarchive.c @@ -132,7 +132,7 @@ static int reopen_archive(stream_t *s) goto error; } if (r < ARCHIVE_OK) - MP_ERR(s, "libarchive: %s\n", archive_error_string(mpa->arch)); + MP_ERR(s, "%s\n", archive_error_string(mpa->arch)); if (r < ARCHIVE_WARN) goto error; if (archive_entry_filetype(entry) != AE_IFREG) @@ -166,7 +166,7 @@ static int archive_entry_fill_buffer(stream_t *s, char *buffer, int max_len) return 0; int r = archive_read_data(p->mpa->arch, buffer, max_len); if (r < 0) - MP_ERR(s, "libarchive: %s\n", archive_error_string(p->mpa->arch)); + MP_ERR(s, "%s\n", archive_error_string(p->mpa->arch)); return r; } @@ -194,7 +194,7 @@ static int archive_entry_seek(stream_t *s, int64_t newpos) int size = MPMIN(newpos - s->pos, sizeof(buffer)); int r = archive_read_data(p->mpa->arch, buffer, size); if (r < 0) { - MP_ERR(s, "libarchive: %s\n", archive_error_string(p->mpa->arch)); + MP_ERR(s, "%s\n", archive_error_string(p->mpa->arch)); return -1; } s->pos += r; -- cgit v1.2.3