From owner-svn-src-all@FreeBSD.ORG Sat Mar 7 03:34:35 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 031D6106564A; Sat, 7 Mar 2009 03:34:35 +0000 (UTC) (envelope-from kientzle@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E53888FC17; Sat, 7 Mar 2009 03:34:34 +0000 (UTC) (envelope-from kientzle@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n273YYuM037682; Sat, 7 Mar 2009 03:34:34 GMT (envelope-from kientzle@svn.freebsd.org) Received: (from kientzle@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n273YYDa037681; Sat, 7 Mar 2009 03:34:34 GMT (envelope-from kientzle@svn.freebsd.org) Message-Id: <200903070334.n273YYDa037681@svn.freebsd.org> From: Tim Kientzle Date: Sat, 7 Mar 2009 03:34:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189483 - head/lib/libarchive/test X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Mar 2009 03:34:35 -0000 Author: kientzle Date: Sat Mar 7 03:34:34 2009 New Revision: 189483 URL: http://svn.freebsd.org/changeset/base/189483 Log: Merge r596,r690 from libarchive.googlecode.com: Minor style and compile warning fixes for test_read_pax_truncated.c. Modified: head/lib/libarchive/test/test_read_pax_truncated.c Modified: head/lib/libarchive/test/test_read_pax_truncated.c ============================================================================== --- head/lib/libarchive/test/test_read_pax_truncated.c Sat Mar 7 03:30:35 2009 (r189482) +++ head/lib/libarchive/test/test_read_pax_truncated.c Sat Mar 7 03:34:34 2009 (r189483) @@ -29,9 +29,8 @@ DEFINE_TEST(test_read_pax_truncated) { struct archive_entry *ae; struct archive *a; - ssize_t used, i; - size_t buff_size = 1000000; - ssize_t filedata_size = 100000; + size_t used, i, buff_size = 1000000; + size_t filedata_size = 100000; char *buff = malloc(buff_size); char *buff2 = malloc(buff_size); char *filedata = malloc(filedata_size); @@ -40,7 +39,8 @@ DEFINE_TEST(test_read_pax_truncated) assert((a = archive_write_new()) != NULL); assertA(0 == archive_write_set_format_pax(a)); assertA(0 == archive_write_set_compression_none(a)); - assertA(0 == archive_write_open_memory(a, buff, buff_size, &used)); + assertEqualIntA(a, ARCHIVE_OK, + archive_write_open_memory(a, buff, buff_size, &used)); /* * Write a file to it. @@ -56,7 +56,8 @@ DEFINE_TEST(test_read_pax_truncated) archive_entry_set_size(ae, filedata_size); assertA(0 == archive_write_header(a, ae)); archive_entry_free(ae); - assertA(filedata_size == archive_write_data(a, filedata, filedata_size)); + assertA((ssize_t)filedata_size + == archive_write_data(a, filedata, filedata_size)); /* Close out the archive. */ assertA(0 == archive_write_close(a));