Date: Thu, 12 May 2016 16:03:55 +0000 (UTC) From: Martin Matuska <mm@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r299539 - in vendor/libarchive/dist: cat libarchive libarchive_fe Message-ID: <201605121603.u4CG3t4n063834@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mm Date: Thu May 12 16:03:55 2016 New Revision: 299539 URL: https://svnweb.freebsd.org/changeset/base/299539 Log: Update vendor/libarchive/dist to git commit f48d99b Integrates my pull requests #701, #702 and #703 Modified: vendor/libarchive/dist/cat/bsdcat.c vendor/libarchive/dist/cat/bsdcat.h vendor/libarchive/dist/libarchive/archive_read_support_format_mtree.c vendor/libarchive/dist/libarchive_fe/err.c Modified: vendor/libarchive/dist/cat/bsdcat.c ============================================================================== --- vendor/libarchive/dist/cat/bsdcat.c Thu May 12 16:01:33 2016 (r299538) +++ vendor/libarchive/dist/cat/bsdcat.c Thu May 12 16:03:55 2016 (r299539) @@ -42,10 +42,10 @@ __FBSDID("$FreeBSD$"); #define BYTES_PER_BLOCK (20*512) -struct archive *a; -struct archive_entry *ae; -char *bsdcat_current_path; -int exit_status = 0; +static struct archive *a; +static struct archive_entry *ae; +static const char *bsdcat_current_path; +static int exit_status = 0; void @@ -68,7 +68,7 @@ version(void) } void -bsdcat_next() +bsdcat_next(void) { a = archive_read_new(); archive_read_support_filter_all(a); @@ -85,7 +85,7 @@ bsdcat_print_error(void) } void -bsdcat_read_to_stdout(char* filename) +bsdcat_read_to_stdout(const char* filename) { int r; Modified: vendor/libarchive/dist/cat/bsdcat.h ============================================================================== --- vendor/libarchive/dist/cat/bsdcat.h Thu May 12 16:01:33 2016 (r299538) +++ vendor/libarchive/dist/cat/bsdcat.h Thu May 12 16:03:55 2016 (r299539) @@ -53,4 +53,4 @@ int bsdcat_getopt(struct bsdcat *); void usage(FILE *stream, int eval); void bsdcat_next(void); void bsdcat_print_error(void); -void bsdcat_read_to_stdout(char* filename); +void bsdcat_read_to_stdout(const char* filename); Modified: vendor/libarchive/dist/libarchive/archive_read_support_format_mtree.c ============================================================================== --- vendor/libarchive/dist/libarchive/archive_read_support_format_mtree.c Thu May 12 16:01:33 2016 (r299538) +++ vendor/libarchive/dist/libarchive/archive_read_support_format_mtree.c Thu May 12 16:03:55 2016 (r299539) @@ -1342,7 +1342,7 @@ parse_line(struct archive_read *a, struc /* strsep() is not in C90, but strcspn() is. */ /* Taken from http://unixpapa.com/incnote/string.html */ static char * -la_strsep(char **sp, char *sep) +la_strsep(char **sp, const char *sep) { char *p, *s; if (sp == NULL || *sp == NULL || **sp == '\0') Modified: vendor/libarchive/dist/libarchive_fe/err.c ============================================================================== --- vendor/libarchive/dist/libarchive_fe/err.c Thu May 12 16:01:33 2016 (r299538) +++ vendor/libarchive/dist/libarchive_fe/err.c Thu May 12 16:03:55 2016 (r299539) @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); static void lafe_vwarnc(int, const char *, va_list) __LA_PRINTFLIKE(2, 0); -const char *lafe_progname; +static const char *lafe_progname; const char * lafe_getprogname(void)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605121603.u4CG3t4n063834>