PERFORCE change 64354 for review
Peter Wemm
peter at FreeBSD.org
Fri Nov 5 11:14:07 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=64354
Change 64354 by peter at 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 {
More information about the p4-projects
mailing list