--- pgp/src/zip.c	2018/04/24 16:37:53	1.1
+++ pgp/src/zip.c	2018/04/24 16:42:11	1.1.1.5
@@ -1,44 +1,41 @@
-/* Support code for the zip/unzip code - just handles error messages.  To
-   get exact errors, define ZIPDEBUG */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "usuals.h"
-#include "fileio.h"
-#include "language.h"
-#include "pgp.h"
-
-/* The following are defined in zip.h but it's easier to redefine them here
-   since the header files do wierd things with __STDC__-compatibility */
-
-#define ZE_MEM		4
-
-/* Clean error exit: c is a ZE_-class error, *msg is an error message.
-   Issue a message for the error, clean up files and memory, and exit */
-
-void err(int c, char *msg)
-	{
-
-#ifdef ZIPDEBUG
-	if (PERR(c))
-		perror("zip error");
-	fprintf(stderr, "zip error: %s (%s)\n", errors[c-1], msg);
-#endif /* ZIPDEBUG */
-
-	/* Complain and return and out of memory error code */
-	if(c==ZE_MEM)
-	{	fprintf( stderr, PSTR("\nOut of memory\n") );
-		exitPGP( 7 );
-	}
-	else
-	{	fprintf( stderr, PSTR("\nCompression/decompression error\n") );	/* Yuck */
-		exitPGP( 23 );
-	}
-	}
-
-/* Internal error, should never happen */
-
-void error(char *msg)
-	{
-	err(-1, msg);
-	}
+/* Support code for the zip/unzip code - just handles error messages.  To
+   get exact errors, define ZIPDEBUG */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "usuals.h"
+#include "fileio.h"
+#include "language.h"
+#include "pgp.h"
+#include "exitpgp.h"
+
+#include "ziperr.h" /* for ZE_MEM (and errors[] if ZIPDEBUG defined) */
+
+/* Clean error exit: c is a ZE_-class error, *msg is an error message.
+   Issue a message for the error, clean up files and memory, and exit */
+
+void err(int c, char *msg)
+{
+
+#ifdef ZIPDEBUG
+	if (PERR(c))
+		perror("zip error");
+	fprintf(stderr, "zip error: %s (%s)\n", errors[c-1], msg);
+#endif /* ZIPDEBUG */
+
+	/* Complain and return and out of memory error code */
+	if(c==ZE_MEM) {
+		fprintf( stderr, LANG("\nOut of memory\n") );
+		exitPGP( 7 );
+	} else {
+		fprintf( stderr, LANG("\nCompression/decompression error\n") );	/* Yuck */
+		exitPGP( 23 );
+	}
+}
+
+/* Internal error, should never happen */
+
+void error(char *msg)
+{
+	err(-1, msg);
+}