Rename ZERR_* to ZIP_ER_*; rename ZIP_ET_ZIP to ZIP_ET_ZLIB;
remove ZIP_CH_ISCOMP from zip.h.

--HG--
branch : HEAD
diff --git a/man/zip_add.mdoc b/man/zip_add.mdoc
index c761a0c..c6493e6 100644
--- a/man/zip_add.mdoc
+++ b/man/zip_add.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_delete.mdoc,v 1.4 2003/10/03 23:26:00 dillo Exp $
+.\" $NiH: zip_add.mdoc,v 1.1 2004/07/04 20:45:54 wiz Exp $
 .\"
 .\" zip_add.mdoc -- add files to zip archive
 .\" Copyright (C) 2004 Dieter Baron and Thomas Klausner
@@ -164,7 +164,7 @@
 .\".Fn zip_delete
 .\"fails if:
 .\".Bl -tag -width Er
-.\".It Bq Er ZERR_INVAL
+.\".It Bq Er ZIP_ER_INVAL
 .\".Ar index
 .\"is not a valid file index in
 .\".Ar archive .
diff --git a/man/zip_close.man b/man/zip_close.man
index 3fd3b48..2bc6e2e 100644
--- a/man/zip_close.man
+++ b/man/zip_close.man
@@ -1,6 +1,6 @@
 .\" Converted with mdoc2man 0.2
 .\" from NiH: zip_close.mdoc,v 1.4 2003/10/03 12:04:08 dillo Exp 
-.\" $NiH: zip_close.mdoc,v 1.4 2003/10/03 12:04:08 dillo Exp $
+.\" $NiH: zip_close.man,v 1.5 2003/12/27 22:51:28 wiz Exp $
 .\"
 .\" zip_close.mdoc \-- close zip archive
 .\" Copyright (C) 2003 Dieter Baron and Thomas Klausner
@@ -65,28 +65,28 @@
 will fail if:
 .RS
 .TP 4
-Bq Er ZERR_INVAL
+Bq Er ZIP_ER_INVAL
 The
 \fBpath\fR
 argument is
 .Dv NULL.
 .TP 4
-Bq Er ZERR_MEMORY
+Bq Er ZIP_ER_MEMORY
 Required memory could not be allocated.
 .TP 4
-Bq Er ZERR_RENAME
+Bq Er ZIP_ER_RENAME
 A temporary file could not be renamed to its final name.
 See
 .Va errno
 for details.
 .TP 4
-Bq Er ZERR_SEEK
+Bq Er ZIP_ER_SEEK
 A file seek  failed.
 See
 .Va errno
 for details.
 .TP 4
-Bq Er ZERR_TMPOPEN
+Bq Er ZIP_ER_TMPOPEN
 A temporary file could not be created.
 See
 .Va errno
diff --git a/man/zip_close.mdoc b/man/zip_close.mdoc
index aad2506..26c722c 100644
--- a/man/zip_close.mdoc
+++ b/man/zip_close.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_close.mdoc,v 1.3 2003/10/03 09:44:43 wiz Exp $
+.\" $NiH: zip_close.mdoc,v 1.4 2003/10/03 12:04:08 dillo Exp $
 .\"
 .\" zip_close.mdoc -- close zip archive
 .\" Copyright (C) 2003 Dieter Baron and Thomas Klausner
@@ -65,24 +65,24 @@
 .Fn zip_close
 will fail if:
 .Bl -tag -width Er
-.It Bq Er ZERR_INVAL
+.It Bq Er ZIP_ER_INVAL
 The
 .Ar path
 argument is
 .Dv NULL .
-.It Bq Er ZERR_MEMORY
+.It Bq Er ZIP_ER_MEMORY
 Required memory could not be allocated.
-.It Bq Er ZERR_RENAME
+.It Bq Er ZIP_ER_RENAME
 A temporary file could not be renamed to its final name.
 See
 .Va errno
 for details.
-.It Bq Er ZERR_SEEK
+.It Bq Er ZIP_ER_SEEK
 A file seek  failed.
 See
 .Va errno
 for details.
-.It Bq Er ZERR_TMPOPEN
+.It Bq Er ZIP_ER_TMPOPEN
 A temporary file could not be created.
 See
 .Va errno
diff --git a/man/zip_delete.man b/man/zip_delete.man
index 6a1e181..9492df6 100644
--- a/man/zip_delete.man
+++ b/man/zip_delete.man
@@ -1,6 +1,6 @@
 .\" Converted with mdoc2man 0.2
 .\" from NiH: zip_delete.mdoc,v 1.4 2003/10/03 23:26:00 dillo Exp 
-.\" $NiH: zip_delete.mdoc,v 1.4 2003/10/03 23:26:00 dillo Exp $
+.\" $NiH: zip_delete.man,v 1.5 2003/12/27 22:51:29 wiz Exp $
 .\"
 .\" zip_delete.mdoc \-- delete files from zip archive
 .\" Copyright (C) 2003 Dieter Baron and Thomas Klausner
@@ -58,7 +58,7 @@
 fails if:
 .RS
 .TP 4
-Bq Er ZERR_INVAL
+Bq Er ZIP_ER_INVAL
 \fBindex\fR
 is not a valid file index in
 \fBarchive.\fR
diff --git a/man/zip_delete.mdoc b/man/zip_delete.mdoc
index 0db4168..b54974b 100644
--- a/man/zip_delete.mdoc
+++ b/man/zip_delete.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_delete.mdoc,v 1.3 2003/10/03 12:04:08 dillo Exp $
+.\" $NiH: zip_delete.mdoc,v 1.4 2003/10/03 23:26:00 dillo Exp $
 .\"
 .\" zip_delete.mdoc -- delete files from zip archive
 .\" Copyright (C) 2003 Dieter Baron and Thomas Klausner
@@ -58,7 +58,7 @@
 .Fn zip_delete
 fails if:
 .Bl -tag -width Er
-.It Bq Er ZERR_INVAL
+.It Bq Er ZIP_ER_INVAL
 .Ar index
 is not a valid file index in
 .Ar archive .
diff --git a/man/zip_fopen.man b/man/zip_fopen.man
index 3ee918e..010b475 100644
--- a/man/zip_fopen.man
+++ b/man/zip_fopen.man
@@ -1,6 +1,6 @@
 .\" Converted with mdoc2man 0.2
 .\" from NiH: zip_fopen.mdoc,v 1.5 2003/10/06 16:37:07 dillo Exp 
-.\" $NiH: zip_fopen.man,v 1.6.2.1 2004/04/14 12:43:43 dillo Exp $
+.\" $NiH: zip_fopen.man,v 1.7 2004/04/14 14:01:29 dillo Exp $
 .\"
 .\" zip_fopen.mdoc \-- open file in zip archvie for reading
 .\" Copyright (C) 2003, 2004 Dieter Baron and Thomas Klausner
@@ -87,22 +87,22 @@
 .SH "ERRORS"
 .RS
 .TP 4
-Bq Er ZERR_CHANGED
+Bq Er ZIP_ER_CHANGED
 The file data has been changed.
 .TP 4
-Bq Er ZERR_COMPNOTSUPP
+Bq Er ZIP_ER_COMPNOTSUPP
 The compression method used is not supported.
 .TP 4
-Bq Er ZERR_MEMORY
+Bq Er ZIP_ER_MEMORY
 Required memory could not be allocated.
 .TP 4
-Bq Er ZERR_READ
+Bq Er ZIP_ER_READ
 A file read error occurred.
 .TP 4
-Bq Er ZERR_SEEK
+Bq Er ZIP_ER_SEEK
 A file seek error occurred.
 .TP 4
-Bq Er ZERR_ZLIB
+Bq Er ZIP_ER_ZLIB
 Initializing the zlib stream failed.
 .RE
 .PP
@@ -116,7 +116,7 @@
 The function
 .Fn zip_fopen_index
 may also fail with
-.Er ZERR_INVAL
+.Er ZIP_ER_INVAL
 if
 \fBindex\fR
 is invalid.
diff --git a/man/zip_fopen.mdoc b/man/zip_fopen.mdoc
index 55329c0..b773bed 100644
--- a/man/zip_fopen.mdoc
+++ b/man/zip_fopen.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_fopen.mdoc,v 1.5.4.1 2004/04/14 12:43:44 dillo Exp $
+.\" $NiH: zip_fopen.mdoc,v 1.6 2004/04/14 14:01:29 dillo Exp $
 .\"
 .\" zip_fopen.mdoc -- open file in zip archvie for reading
 .\" Copyright (C) 2003, 2004 Dieter Baron and Thomas Klausner
@@ -85,17 +85,17 @@
 is set to indicate the error.
 .Sh ERRORS
 .Bl -tag -width Er
-.It Bq Er ZERR_CHANGED
+.It Bq Er ZIP_ER_CHANGED
 The file data has been changed.
-.It Bq Er ZERR_COMPNOTSUPP
+.It Bq Er ZIP_ER_COMPNOTSUPP
 The compression method used is not supported.
-.It Bq Er ZERR_MEMORY
+.It Bq Er ZIP_ER_MEMORY
 Required memory could not be allocated.
-.It Bq Er ZERR_READ
+.It Bq Er ZIP_ER_READ
 A file read error occurred.
-.It Bq Er ZERR_SEEK
+.It Bq Er ZIP_ER_SEEK
 A file seek error occurred.
-.It Bq Er ZERR_ZLIB
+.It Bq Er ZIP_ER_ZLIB
 Initializing the zlib stream failed.
 .El
 .Pp
@@ -109,7 +109,7 @@
 The function
 .Fn zip_fopen_index
 may also fail with
-.Er ZERR_INVAL
+.Er ZIP_ER_INVAL
 if
 .Ar index
 is invalid.
diff --git a/man/zip_get_name.man b/man/zip_get_name.man
index 7da7d26..576873f 100644
--- a/man/zip_get_name.man
+++ b/man/zip_get_name.man
@@ -1,6 +1,6 @@
 .\" Converted with mdoc2man 0.2
 .\" from NiH: zip_get_name.mdoc,v 1.3 2003/12/27 22:50:28 wiz Exp 
-.\" $NiH: zip_get_name.mdoc,v 1.3 2003/12/27 22:50:28 wiz Exp $
+.\" $NiH: zip_get_name.man,v 1.4 2003/12/27 22:51:29 wiz Exp $
 .\"
 .\" zip_get_name.mdoc \-- get name of file by index
 .\" Copyright (C) 2003 Dieter Baron and Thomas Klausner
@@ -64,7 +64,7 @@
 fails if:
 .RS
 .TP 4
-Bq Er ZERR_INVAL
+Bq Er ZIP_ER_INVAL
 \fBindex\fR
 is not a valid file index in
 \fBarchive.\fR
diff --git a/man/zip_get_name.mdoc b/man/zip_get_name.mdoc
index a03c77f..3522528 100644
--- a/man/zip_get_name.mdoc
+++ b/man/zip_get_name.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_get_name.mdoc,v 1.2 2003/10/03 23:34:23 wiz Exp $
+.\" $NiH: zip_get_name.mdoc,v 1.3 2003/12/27 22:50:28 wiz Exp $
 .\"
 .\" zip_get_name.mdoc -- get name of file by index
 .\" Copyright (C) 2003 Dieter Baron and Thomas Klausner
@@ -64,7 +64,7 @@
 .Fn zip_get_name
 fails if:
 .Bl -tag -width Er
-.It Bq Er ZERR_INVAL
+.It Bq Er ZIP_ER_INVAL
 .Ar index
 is not a valid file index in
 .Ar archive .
diff --git a/man/zip_open.man b/man/zip_open.man
index 608606a..b6bf7d4 100644
--- a/man/zip_open.man
+++ b/man/zip_open.man
@@ -1,6 +1,6 @@
 .\" Converted with mdoc2man 0.2
 .\" from NiH: zip_open.mdoc,v 1.15 2003/12/28 00:51:51 wiz Exp 
-.\" $NiH: zip_open.mdoc,v 1.15 2003/12/28 00:51:51 wiz Exp $
+.\" $NiH: zip_open.man,v 1.11 2003/12/28 00:52:13 wiz Exp $
 .\"
 .\" zip_open.mdoc \-- open zip archive
 .\" Copyright (C) 2003 Dieter Baron and Thomas Klausner
@@ -87,52 +87,52 @@
 is opened unless:
 .RS
 .TP 4
-Bq Er ZERR_EXISTS
+Bq Er ZIP_ER_EXISTS
 The file specified by
 \fBpath\fR
 exists and
 .Dv ZIP_EXCL
 is set.
 .TP 4
-Bq Er ZERR_INCONS
+Bq Er ZIP_ER_INCONS
 Inconsistencies were found in the file specified by
 \fBpath\fR
 and
 .Dv ZIP_CHECKCONS
 was specified.
 .TP 4
-Bq Er ZERR_INVAL
+Bq Er ZIP_ER_INVAL
 The
 \fBpath\fR
 argument is
 .Dv NULL.
 .TP 4
-Bq Er ZERR_MEMORY
+Bq Er ZIP_ER_MEMORY
 Required memory could not be allocated.
 .TP 4
-Bq Er ZERR_NOENT
+Bq Er ZIP_ER_NOENT
 The file specified by
 \fBpath\fR
 does not exist and
 .Dv ZIP_CREATE
 is not set.
 .TP 4
-Bq Er ZERR_NOZIP
+Bq Er ZIP_ER_NOZIP
 The file specified by
 \fBpath\fR
 is not a zip archive.
 .TP 4
-Bq Er ZERR_OPEN
+Bq Er ZIP_ER_OPEN
 The file specified by
 \fBpath\fR
 could not be opened.
 .TP 4
-Bq Er ZERR_READ
+Bq Er ZIP_ER_READ
 A read error occurred; see
 .Va errno
 for details.
 .TP 4
-Bq Er ZERR_SEEK
+Bq Er ZIP_ER_SEEK
 The file specified by
 \fBpath\fR
 does not allow seeks.
diff --git a/man/zip_open.mdoc b/man/zip_open.mdoc
index 67ce74c..b0f5f3e 100644
--- a/man/zip_open.mdoc
+++ b/man/zip_open.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_open.mdoc,v 1.14 2003/12/27 22:37:34 wiz Exp $
+.\" $NiH: zip_open.mdoc,v 1.15 2003/12/28 00:51:51 wiz Exp $
 .\"
 .\" zip_open.mdoc -- open zip archive
 .\" Copyright (C) 2003 Dieter Baron and Thomas Klausner
@@ -84,44 +84,44 @@
 .Ar path
 is opened unless:
 .Bl -tag -width Er
-.It Bq Er ZERR_EXISTS
+.It Bq Er ZIP_ER_EXISTS
 The file specified by
 .Ar path
 exists and
 .Dv ZIP_EXCL
 is set.
-.It Bq Er ZERR_INCONS
+.It Bq Er ZIP_ER_INCONS
 Inconsistencies were found in the file specified by
 .Ar path
 and
 .Dv ZIP_CHECKCONS
 was specified.
-.It Bq Er ZERR_INVAL
+.It Bq Er ZIP_ER_INVAL
 The
 .Ar path
 argument is
 .Dv NULL .
-.It Bq Er ZERR_MEMORY
+.It Bq Er ZIP_ER_MEMORY
 Required memory could not be allocated.
-.It Bq Er ZERR_NOENT
+.It Bq Er ZIP_ER_NOENT
 The file specified by
 .Ar path
 does not exist and
 .Dv ZIP_CREATE
 is not set.
-.It Bq Er ZERR_NOZIP
+.It Bq Er ZIP_ER_NOZIP
 The file specified by
 .Ar path
 is not a zip archive.
-.It Bq Er ZERR_OPEN
+.It Bq Er ZIP_ER_OPEN
 The file specified by
 .Ar path
 could not be opened.
-.It Bq Er ZERR_READ
+.It Bq Er ZIP_ER_READ
 A read error occurred; see
 .Va errno
 for details.
-.It Bq Er ZERR_SEEK
+.It Bq Er ZIP_ER_SEEK
 The file specified by
 .Ar path
 does not allow seeks.
diff --git a/man/zip_rename.man b/man/zip_rename.man
index 06cef81..0106578 100644
--- a/man/zip_rename.man
+++ b/man/zip_rename.man
@@ -1,6 +1,6 @@
 .\" Converted with mdoc2man 0.2
 .\" from NiH: zip_rename.mdoc,v 1.1 2003/10/03 23:26:01 dillo Exp 
-.\" $NiH: zip_rename.mdoc,v 1.1 2003/10/03 23:26:01 dillo Exp $
+.\" $NiH: zip_rename.man,v 1.2 2003/12/27 22:51:30 wiz Exp $
 .\"
 .\" zip_rename.mdoc \-- rename file in zip archive
 .\" Copyright (C) 2003 Dieter Baron and Thomas Klausner
@@ -59,7 +59,7 @@
 fails if:
 .RS
 .TP 4
-Bq Er ZERR_INVAL
+Bq Er ZIP_ER_INVAL
 \fBindex\fR
 is not a valid file index in
 \fBarchive.\fR
diff --git a/man/zip_rename.mdoc b/man/zip_rename.mdoc
index 3064354..92ad164 100644
--- a/man/zip_rename.mdoc
+++ b/man/zip_rename.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH$
+.\" $NiH: zip_rename.mdoc,v 1.1 2003/10/03 23:26:01 dillo Exp $
 .\"
 .\" zip_rename.mdoc -- rename file in zip archive
 .\" Copyright (C) 2003 Dieter Baron and Thomas Klausner
@@ -59,7 +59,7 @@
 .Fn zip_rename
 fails if:
 .Bl -tag -width Er
-.It Bq Er ZERR_INVAL
+.It Bq Er ZIP_ER_INVAL
 .Ar index
 is not a valid file index in
 .Ar archive .
diff --git a/man/zip_stat.man b/man/zip_stat.man
index f5a0caf..0d38570 100644
--- a/man/zip_stat.man
+++ b/man/zip_stat.man
@@ -1,6 +1,6 @@
 .\" Converted with mdoc2man 0.2
 .\" from NiH: zip_stat.mdoc,v 1.2 2004/04/14 14:01:30 dillo Exp 
-.\" $NiH: zip_stat.mdoc,v 1.2 2004/04/14 14:01:30 dillo Exp $
+.\" $NiH: zip_stat.man,v 1.4 2004/04/14 14:36:26 dillo Exp $
 .\"
 .\" zip_stat.mdoc \-- get information about file
 .\" Copyright (C) 2003, 2004 Dieter Baron and Thomas Klausner
@@ -98,10 +98,10 @@
 The function
 .Fn zip_stata_index
 fails and sets the error information to
-.Er ZERR_INVAL
+.Er ZIP_ER_INVAL
 if
 \fBindex\fR
 is invalid.
-.\" XXX: ZERR_CHANGED
+.\" XXX: ZIP_ER_CHANGED
 .SH "SEE ALSO"
 zip_name_locate(3)
diff --git a/man/zip_stat.mdoc b/man/zip_stat.mdoc
index 096c876..e5bcdbf 100644
--- a/man/zip_stat.mdoc
+++ b/man/zip_stat.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_stat.mdoc,v 1.1.4.1 2004/04/14 12:43:45 dillo Exp $
+.\" $NiH: zip_stat.mdoc,v 1.2 2004/04/14 14:01:30 dillo Exp $
 .\"
 .\" zip_stat.mdoc -- get information about file
 .\" Copyright (C) 2003, 2004 Dieter Baron and Thomas Klausner
@@ -99,10 +99,10 @@
 The function
 .Fn zip_stata_index
 fails and sets the error information to
-.Er ZERR_INVAL
+.Er ZIP_ER_INVAL
 if
 .Ar index
 is invalid.
-.\" XXX: ZERR_CHANGED
+.\" XXX: ZIP_ER_CHANGED
 .Sh SEE ALSO
 .Xr zip_name_locate 3
diff --git a/man/zip_unchange.man b/man/zip_unchange.man
index 2411cd7..721abe3 100644
--- a/man/zip_unchange.man
+++ b/man/zip_unchange.man
@@ -1,6 +1,6 @@
 .\" Converted with mdoc2man 0.2
 .\" from NiH: zip_unchange.mdoc,v 1.3 2003/10/03 12:04:09 dillo Exp 
-.\" $NiH: zip_unchange.mdoc,v 1.3 2003/10/03 12:04:09 dillo Exp $
+.\" $NiH: zip_unchange.man,v 1.4 2003/12/27 22:51:30 wiz Exp $
 .\"
 .\" zip_unchange.mdoc \-- undo changes to file in zip archive
 .\" Copyright (C) 2003 Dieter Baron and Thomas Klausner
@@ -56,7 +56,7 @@
 fails if:
 .RS
 .TP 4
-Bq Er ZERR_INVAL
+Bq Er ZIP_ER_INVAL
 \fBindex\fR
 is not a valid file index in
 \fBzip.\fR
diff --git a/man/zip_unchange.mdoc b/man/zip_unchange.mdoc
index 35c813b..0bd3d0c 100644
--- a/man/zip_unchange.mdoc
+++ b/man/zip_unchange.mdoc
@@ -1,4 +1,4 @@
-.\" $NiH: zip_unchange.mdoc,v 1.2 2003/10/03 09:44:43 wiz Exp $
+.\" $NiH: zip_unchange.mdoc,v 1.3 2003/10/03 12:04:09 dillo Exp $
 .\"
 .\" zip_unchange.mdoc -- undo changes to file in zip archive
 .\" Copyright (C) 2003 Dieter Baron and Thomas Klausner
@@ -56,7 +56,7 @@
 .Fn zip_unchange
 fails if:
 .Bl -tag -width Er
-.It Bq Er ZERR_INVAL
+.It Bq Er ZIP_ER_INVAL
 .Ar index
 is not a valid file index in
 .Ar zip .