diff options
author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2022-04-14 15:18:41 +0300 |
---|---|---|
committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2022-04-21 08:56:25 +0300 |
commit | 0d1a7042db919e15079e264a47375ed5e33a3ef7 (patch) | |
tree | 14e15a191c34be1a20ef757814bf190e31f963e3 /src/libs/3rdparty/libarchive/archive_read_support_format_mtree.c | |
parent | ad86c7a132dbaba908f56124c520202e84cb1b8b (diff) |
Update libarchive sources to 3.6.1 release
Release details:
https://github.com/libarchive/libarchive/releases/tag/v3.6.1
Change-Id: I57275393c785195cf0ae19bfc59be42c7c5e4875
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'src/libs/3rdparty/libarchive/archive_read_support_format_mtree.c')
-rw-r--r-- | src/libs/3rdparty/libarchive/archive_read_support_format_mtree.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/libs/3rdparty/libarchive/archive_read_support_format_mtree.c b/src/libs/3rdparty/libarchive/archive_read_support_format_mtree.c index 88bca76fb..4a2816325 100644 --- a/src/libs/3rdparty/libarchive/archive_read_support_format_mtree.c +++ b/src/libs/3rdparty/libarchive/archive_read_support_format_mtree.c @@ -692,7 +692,7 @@ detect_form(struct archive_read *a, int *is_form_d) { const char *p; ssize_t avail, ravail; - ssize_t detected_bytes = 0, len, nl; + ssize_t len, nl; int entry_cnt = 0, multiline = 0; int form_D = 0;/* The archive is generated by `NetBSD mtree -D' * (In this source we call it `form D') . */ @@ -728,8 +728,6 @@ detect_form(struct archive_read *a, int *is_form_d) * character of previous line was '\' character. */ if (bid_keyword_list(p, len, 0, 0) <= 0) break; - if (multiline == 1) - detected_bytes += len; if (p[len-nl-1] != '\\') { if (multiline == 1 && ++entry_cnt >= MAX_BID_ENTRY) @@ -745,7 +743,6 @@ detect_form(struct archive_read *a, int *is_form_d) keywords = bid_entry(p, len, nl, &last_is_path); if (keywords >= 0) { - detected_bytes += len; if (form_D == 0) { if (last_is_path) form_D = 1; |