From owner-svn-src-all@FreeBSD.ORG Mon Dec 28 03:28:21 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 A72561065672; Mon, 28 Dec 2009 03:28:21 +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 7D36F8FC1B; Mon, 28 Dec 2009 03:28:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBS3SLGU077986; Mon, 28 Dec 2009 03:28:21 GMT (envelope-from kientzle@svn.freebsd.org) Received: (from kientzle@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBS3SLND077982; Mon, 28 Dec 2009 03:28:21 GMT (envelope-from kientzle@svn.freebsd.org) Message-Id: <200912280328.nBS3SLND077982@svn.freebsd.org> From: Tim Kientzle Date: Mon, 28 Dec 2009 03:28:21 +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: r201108 - head/lib/libarchive 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: Mon, 28 Dec 2009 03:28:21 -0000 Author: kientzle Date: Mon Dec 28 03:28:21 2009 New Revision: 201108 URL: http://svn.freebsd.org/changeset/base/201108 Log: Fix some unused variables and dead assignments. Modified: head/lib/libarchive/archive_read_support_compression_bzip2.c head/lib/libarchive/archive_write_set_compression_xz.c head/lib/libarchive/archive_write_set_format_ar.c Modified: head/lib/libarchive/archive_read_support_compression_bzip2.c ============================================================================== --- head/lib/libarchive/archive_read_support_compression_bzip2.c Mon Dec 28 03:25:33 2009 (r201107) +++ head/lib/libarchive/archive_read_support_compression_bzip2.c Mon Dec 28 03:28:21 2009 (r201108) @@ -210,12 +210,11 @@ static ssize_t bzip2_filter_read(struct archive_read_filter *self, const void **p) { struct private_data *state; - size_t read_avail, decompressed; + size_t decompressed; const char *read_buf; ssize_t ret; state = (struct private_data *)self->data; - read_avail = 0; if (state->eof) { *p = NULL; @@ -348,7 +347,7 @@ bzip2_filter_close(struct archive_read_f free(state->out_block); free(state); - return (ARCHIVE_OK); + return (ret); } #endif /* HAVE_BZLIB_H */ Modified: head/lib/libarchive/archive_write_set_compression_xz.c ============================================================================== --- head/lib/libarchive/archive_write_set_compression_xz.c Mon Dec 28 03:25:33 2009 (r201107) +++ head/lib/libarchive/archive_write_set_compression_xz.c Mon Dec 28 03:28:21 2009 (r201108) @@ -323,7 +323,6 @@ archive_compressor_xz_finish(struct arch block_length = state->stream.next_out - state->compressed; /* Tricky calculation to determine size of last block. */ - target_block_length = block_length; if (a->bytes_in_last_block <= 0) /* Default or Zero: pad to full block */ target_block_length = a->bytes_per_block; Modified: head/lib/libarchive/archive_write_set_format_ar.c ============================================================================== --- head/lib/libarchive/archive_write_set_format_ar.c Mon Dec 28 03:25:33 2009 (r201107) +++ head/lib/libarchive/archive_write_set_format_ar.c Mon Dec 28 03:28:21 2009 (r201108) @@ -145,7 +145,6 @@ archive_write_ar_header(struct archive_w const char *filename; int64_t size; - ret = 0; append_fn = 0; ar = (struct ar_w *)a->format_data; ar->is_strtab = 0;