diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2019-06-11 23:16:13 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2019-06-11 23:16:13 +0000 |
| commit | e3586989c2bb0a5fe79b03eaa5ab50eec20eaf26 (patch) | |
| tree | 489620a6c8afeeefb3bf2affc04d0c757f3474a8 /libarchive/archive_write_add_filter_b64encode.c | |
| parent | 8e97bbedaebab6c0c9e87545b8424c95f206f148 (diff) | |
| download | src-e3586989c2bb0a5fe79b03eaa5ab50eec20eaf26.tar.gz src-e3586989c2bb0a5fe79b03eaa5ab50eec20eaf26.zip | |
Update vendor/libarchive/dist to git 614110e76d9dbb9ed3e159a71cbd75fa3b23efe3vendor/libarchive/3.4.0
Relevant vendor changes (release 3.4.0):
- check_symlinks_fsobj() without chdir() and fchdir()
- bsdtar.1 manpage fixes
- patches from OpenBSD to libarchive_fe/passphrase.c
Notes
Notes:
svn path=/vendor/libarchive/dist/; revision=348971
svn path=/vendor/libarchive/3.4.0/; revision=348973; tag=vendor/libarchive/3.4.0
Diffstat (limited to 'libarchive/archive_write_add_filter_b64encode.c')
| -rw-r--r-- | libarchive/archive_write_add_filter_b64encode.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libarchive/archive_write_add_filter_b64encode.c b/libarchive/archive_write_add_filter_b64encode.c index 85eb087b0522..b46b19a0c74d 100644 --- a/libarchive/archive_write_add_filter_b64encode.c +++ b/libarchive/archive_write_add_filter_b64encode.c @@ -60,7 +60,7 @@ static int archive_filter_b64encode_write(struct archive_write_filter *, const void *, size_t); static int archive_filter_b64encode_close(struct archive_write_filter *); static int archive_filter_b64encode_free(struct archive_write_filter *); -static void b64_encode(struct archive_string *, const unsigned char *, size_t); +static void la_b64_encode(struct archive_string *, const unsigned char *, size_t); static int64_t atol8(const char *, size_t); static const char base64[] = { @@ -180,7 +180,7 @@ archive_filter_b64encode_open(struct archive_write_filter *f) } static void -b64_encode(struct archive_string *as, const unsigned char *p, size_t len) +la_b64_encode(struct archive_string *as, const unsigned char *p, size_t len) { int c; @@ -234,12 +234,12 @@ archive_filter_b64encode_write(struct archive_write_filter *f, const void *buff, } if (state->hold_len < LBYTES) return (ret); - b64_encode(&state->encoded_buff, state->hold, LBYTES); + la_b64_encode(&state->encoded_buff, state->hold, LBYTES); state->hold_len = 0; } for (; length >= LBYTES; length -= LBYTES, p += LBYTES) - b64_encode(&state->encoded_buff, p, LBYTES); + la_b64_encode(&state->encoded_buff, p, LBYTES); /* Save remaining bytes. */ if (length > 0) { @@ -270,7 +270,7 @@ archive_filter_b64encode_close(struct archive_write_filter *f) /* Flush remaining bytes. */ if (state->hold_len != 0) - b64_encode(&state->encoded_buff, state->hold, state->hold_len); + la_b64_encode(&state->encoded_buff, state->hold, state->hold_len); archive_string_sprintf(&state->encoded_buff, "====\n"); /* Write the last block */ archive_write_set_bytes_in_last_block(f->archive, 1); |