From f0a452186e33d3e144c55af3f4eef7256bd0d880 Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Sat, 9 Aug 2008 23:14:37 +0000 Subject: Fix up mergeinfo to reflect the current status of this branch. stable/7/lib/libarchive was already almost identical to head/lib/libarchive@177777. This matches it up exactly (except that I declined to resurrect the .cvsignore file) and records that alignment in svn:mergeinfo. --- lib/libarchive/test/test_write_format_cpio_newc.c | 1 + lib/libarchive/test/test_write_format_cpio_odc.c | 1 + 2 files changed, 2 insertions(+) (limited to 'lib') diff --git a/lib/libarchive/test/test_write_format_cpio_newc.c b/lib/libarchive/test/test_write_format_cpio_newc.c index eec746ba6f4b..9b16e47cceac 100644 --- a/lib/libarchive/test/test_write_format_cpio_newc.c +++ b/lib/libarchive/test/test_write_format_cpio_newc.c @@ -25,6 +25,7 @@ #include "test.h" __FBSDID("$FreeBSD$"); + static int is_hex(const char *p, size_t l) { diff --git a/lib/libarchive/test/test_write_format_cpio_odc.c b/lib/libarchive/test/test_write_format_cpio_odc.c index 94c027b6307b..796dd7eace9a 100644 --- a/lib/libarchive/test/test_write_format_cpio_odc.c +++ b/lib/libarchive/test/test_write_format_cpio_odc.c @@ -25,6 +25,7 @@ #include "test.h" __FBSDID("$FreeBSD$"); + static int is_octal(const char *p, size_t l) { -- cgit v1.3