patches from Mike Frysinger

 (zzip/file.c zzip/zzip.h docs/functions.htm ChangeLog)

diff --git a/ChangeLog b/ChangeLog
index 72174bb6965d474834de97a779f3a1a6249663fb..58ee09d1598886c06741be184219f11ebf1089f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-31
+ * applying patches from Mike Frysinger
+ * consider making the manpage install target part of the default 
+   `make install` rather than a sep install-man3 target ?
+       
 2006-09-27
  * adding docs/zip-php.htm integrating Chris Branch's mail into the docs
  * appending docs/changes.htm rule from ./ChangeLog 

diff --git a/docs/functions.htm b/docs/functions.htm
index c4e4d899ffb9ffa8b7b4335c7dedc476b5654ecd..1ded1f47d662f874c439c3c3a36e7f049e86d1e7 100644 (file)
--- a/docs/functions.htm
+++ b/docs/functions.htm
@@ -2,7 +2,7 @@
 <date>2006-09-21</date>
 
 <P>
-  The ZZipLib Project does already profive THREE libraries. The classic
+  The ZZipLib Project does already provide THREE libraries. The classic
   zziplib.so (via "zzip/lib.h") is the most prominent one and used in
   a number of different projects. The zzipfseeko.so ("zzip/fseeko.html")
   and zzipmmapped.so ("zzip/mmapped.html") are technology demonstrations.

diff --git a/zzip/file.c b/zzip/file.c
index b80be7c1330fc877977e6b3d26a9c392f949ad37..9aa93fdab112d40db0f4c95690ef39ecb8d6808b 100644 (file)
--- a/zzip/file.c
+++ b/zzip/file.c
@@ -339,7 +339,7 @@ zzip_close(ZZIP_FILE* fp)
  *       a smaller buffer.
  */
 zzip_ssize_t 
-zzip_file_read(ZZIP_FILE * fp, char * buf, zzip_size_t len)
+zzip_file_read(ZZIP_FILE * fp, void * buf, zzip_size_t len)
 {
     ZZIP_DIR * dir; 
     zzip_size_t l;
@@ -429,7 +429,7 @@ zzip_file_read(ZZIP_FILE * fp, char * buf, zzip_size_t len)
  * to decompress the data stream and any error is mapped to => errno(3).
  */
 zzip_ssize_t
-zzip_read(ZZIP_FILE * fp, char * buf, zzip_size_t len)
+zzip_read(ZZIP_FILE * fp, void * buf, zzip_size_t len)
 {
     if (! fp) return 0;
     if (! fp->dir) 

diff --git a/zzip/zzip.h b/zzip/zzip.h
index b3bb4a2228c749ab2dbf4686e36e368cd240dcab..6f2c51690806134fdd2d2f7c1c4fb81ce5e18c4e 100644 (file)
--- a/zzip/zzip.h
+++ b/zzip/zzip.h
@@ -176,14 +176,14 @@ ZZIP_FILE *       zzip_file_open(ZZIP_DIR * dir, zzip_char_t* name, int flags);
 _zzip_export
 int            zzip_file_close(ZZIP_FILE * fp);
 _zzip_export
-zzip_ssize_t   zzip_file_read(ZZIP_FILE * fp, char* buf, zzip_size_t len);
+zzip_ssize_t   zzip_file_read(ZZIP_FILE * fp, void* buf, zzip_size_t len);
 
 _zzip_export
 ZZIP_FILE *    zzip_open(zzip_char_t* name, int flags);
 _zzip_export
 int            zzip_close(ZZIP_FILE * fp);
 _zzip_export
-zzip_ssize_t   zzip_read(ZZIP_FILE * fp, char * buf, zzip_size_t len);
+zzip_ssize_t   zzip_read(ZZIP_FILE * fp, void * buf, zzip_size_t len);
 
 /*
  * the stdc variant to open/read/close files. - Take note of the freopen()