RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-03 05:31:34 +00:00
Code Issues Releases Wiki Activity

libarchive: remove redundant log prefix

Browse Source 
"libarchive:" is already added by the logging system
This commit is contained in:
Kevin Mitchell 2015-11-06 19:23:00 -08:00
parent 434512827f
commit cf5b117553
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demux/demux_libarchive.c
View File

@ -71,7 +71,7 @@ static int open_file(struct demuxer *demuxer, enum demux_check check)
if (r == ARCHIVE_EOF) if (r == ARCHIVE_EOF)
break; break;
if (r < ARCHIVE_OK) 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) if (r < ARCHIVE_WARN)
break; break;
if (archive_entry_filetype(entry) != AE_IFREG) if (archive_entry_filetype(entry) != AE_IFREG)

6
stream/stream_libarchive.c
View File

@ -132,7 +132,7 @@ static int reopen_archive(stream_t *s)
goto error; goto error;
} }
if (r < ARCHIVE_OK) 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) if (r < ARCHIVE_WARN)
goto error; goto error;
if (archive_entry_filetype(entry) != AE_IFREG) 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; return 0;
int r = archive_read_data(p->mpa->arch, buffer, max_len); int r = archive_read_data(p->mpa->arch, buffer, max_len);
if (r < 0) 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; 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 size = MPMIN(newpos - s->pos, sizeof(buffer));
int r = archive_read_data(p->mpa->arch, buffer, size); int r = archive_read_data(p->mpa->arch, buffer, size);
if (r < 0) { 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; return -1;
} }
s->pos += r; s->pos += r;