From owner-p4-projects@FreeBSD.ORG Fri Nov 5 19:14:07 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8737E16A4D5; Fri, 5 Nov 2004 19:14:06 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 894C716A4E0 for ; Fri, 5 Nov 2004 19:14:04 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5911D43D4C for ; Fri, 5 Nov 2004 19:14:04 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA5JE4kb024485 for ; Fri, 5 Nov 2004 19:14:04 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA5JE4a2024482 for perforce@freebsd.org; Fri, 5 Nov 2004 19:14:04 GMT (envelope-from peter@freebsd.org) Date: Fri, 5 Nov 2004 19:14:04 GMT Message-Id: <200411051914.iA5JE4a2024482@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64354 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Nov 2004 19:14:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=64354 Change 64354 by peter@peter_daintree on 2004/11/05 19:13:46 Fix (I think) the int vs ssize_t mess. Affected files ... .. //depot/projects/hammer/lib/libarchive/archive_private.h#14 edit .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_bzip2.c#7 edit .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_gzip.c#8 edit .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_none.c#7 edit Differences ... ==== //depot/projects/hammer/lib/libarchive/archive_private.h#14 (text+ko) ==== @@ -123,7 +123,7 @@ void *compression_data; /* Data for (de)compressor. */ int (*compression_init)(struct archive *); /* Initialize. */ int (*compression_finish)(struct archive *); - ssize_t (*compression_write)(struct archive *, const void *, size_t); + int (*compression_write)(struct archive *, const void *, size_t); /* * Read uses a peek/consume I/O model: the decompression code * returns a pointer to the requested block and advances the ==== //depot/projects/hammer/lib/libarchive/archive_write_set_compression_bzip2.c#7 (text+ko) ==== @@ -57,7 +57,7 @@ static int archive_compressor_bzip2_finish(struct archive *); static int archive_compressor_bzip2_init(struct archive *); -static ssize_t archive_compressor_bzip2_write(struct archive *, const void *, +static int archive_compressor_bzip2_write(struct archive *, const void *, size_t); static int drive_compressor(struct archive *, struct private_data *, int finishing); ==== //depot/projects/hammer/lib/libarchive/archive_write_set_compression_gzip.c#8 (text+ko) ==== @@ -58,7 +58,7 @@ static int archive_compressor_gzip_finish(struct archive *); static int archive_compressor_gzip_init(struct archive *); -static ssize_t archive_compressor_gzip_write(struct archive *, const void *, +static int archive_compressor_gzip_write(struct archive *, const void *, size_t); static int drive_compressor(struct archive *, struct private_data *, int finishing); ==== //depot/projects/hammer/lib/libarchive/archive_write_set_compression_none.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ static int archive_compressor_none_finish(struct archive *a); static int archive_compressor_none_init(struct archive *); -static ssize_t archive_compressor_none_write(struct archive *, const void *, +static int archive_compressor_none_write(struct archive *, const void *, size_t); struct archive_none {