From owner-cvs-src@FreeBSD.ORG Fri Nov 5 19:06:11 2004 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5E14316A4CF; Fri, 5 Nov 2004 19:06:11 +0000 (GMT) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D58D43D41; Fri, 5 Nov 2004 19:06:11 +0000 (GMT) (envelope-from peter@wemm.org) Received: from fw.wemm.org (canning.wemm.org [192.203.228.65]) by canning.wemm.org (Postfix) with ESMTP id D3DAB2A92A; Fri, 5 Nov 2004 11:06:10 -0800 (PST) (envelope-from peter@wemm.org) Received: from overcee.wemm.org (overcee.wemm.org [10.0.0.3]) by fw.wemm.org (Postfix) with ESMTP id 6B0C8E2B3; Fri, 5 Nov 2004 11:06:10 -0800 (PST) (envelope-from peter@wemm.org) Received: from overcee.wemm.org (localhost [127.0.0.1]) by overcee.wemm.org (8.13.1/8.13.1) with ESMTP id iA5J69OO051905; Fri, 5 Nov 2004 11:06:09 -0800 (PST) (envelope-from peter@wemm.org) Received: from localhost (localhost [[UNIX: localhost]]) by overcee.wemm.org (8.13.1/8.13.1/Submit) id iA5J692D051904; Fri, 5 Nov 2004 11:06:09 -0800 (PST) (envelope-from peter@wemm.org) X-Authentication-Warning: overcee.wemm.org: peter set sender to peter@wemm.org using -f From: Peter Wemm To: Tim Kientzle Date: Fri, 5 Nov 2004 11:06:09 -0800 User-Agent: KMail/1.7 References: <200411050526.iA55QUIb068633@repoman.freebsd.org> In-Reply-To: <200411050526.iA55QUIb068633@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200411051106.09523.peter@wemm.org> cc: cvs-src@freebsd.org cc: src-committers@freebsd.org cc: cvs-all@freebsd.org Subject: Re: cvs commit: src/lib/libarchive archive_write.3 archive_write.c archive_write_set_compression_bzip2.c archive_write_set_compression_gzip.c archive_write_set_compression_none.c archive_write_set_format_cpio.c archive_write_set_format_pax.c archive_write_set_format_shar.c archive_write_set_format_ustar.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Nov 2004 19:06:11 -0000 This broke world for me: /home/peter/fbp4/hammer/lib/libarchive/archive_write_set_compression_bzip2.c:163: error: conflicting types for 'archive_compressor_bzip2_write' /home/peter/fbp4/hammer/lib/libarchive/archive_write_set_compression_bzip2.c:61: error: previous declaration of 'archive_compressor_bzip2_write' was here /home/peter/fbp4/hammer/lib/libarchive/archive_write_set_compression_bzip2.c:163: error: conflicting types for 'archive_compressor_bzip2_write' /home/peter/fbp4/hammer/lib/libarchive/archive_write_set_compression_bzip2.c:61: error: previous declaration of 'archive_compressor_bzip2_write' was here /home/peter/fbp4/hammer/lib/libarchive/archive_write_set_compression_bzip2.c:61: warning: 'archive_compressor_bzip2_write' used but never defined /home/peter/fbp4/hammer/lib/libarchive/archive_write_set_compression_bzip2.c:163: warning: 'archive_compressor_bzip2_write' defined but not used *** Error code 1 'int' != 'ssize_t'. In the patch you changed a 'static ssize_t' to a 'static int' and didn't update the prototype. On Thursday 04 November 2004 09:26 pm, Tim Kientzle wrote: > kientzle 2004-11-05 05:26:30 UTC > > FreeBSD src repository > > Modified files: > lib/libarchive archive_write.3 archive_write.c > archive_write_set_compression_bzip2.c > archive_write_set_compression_gzip.c > archive_write_set_compression_none.c > archive_write_set_format_cpio.c > archive_write_set_format_pax.c > archive_write_set_format_shar.c > archive_write_set_format_ustar.c > Log: > Clean up the error handling in the > write path. In particular, this should > solve some problems people have seen with > bsdtar not exiting on various write errors. > > Revision Changes Path > 1.8 +7 -7 src/lib/libarchive/archive_write.3 > 1.13 +4 -1 src/lib/libarchive/archive_write.c > 1.6 +27 -18 > src/lib/libarchive/archive_write_set_compression_bzip2.c 1.8 > +28 -19 src/lib/libarchive/archive_write_set_compression_gzip.c > 1.6 +17 -9 > src/lib/libarchive/archive_write_set_compression_none.c 1.5 +9 > -9 src/lib/libarchive/archive_write_set_format_cpio.c 1.19 > +8 -8 src/lib/libarchive/archive_write_set_format_pax.c 1.11 > +109 -58 src/lib/libarchive/archive_write_set_format_shar.c 1.12 > +4 -4 src/lib/libarchive/archive_write_set_format_ustar.c -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5