Merged in changes from CVS trunk.

[bpt/emacs.git] / lib-src / cvtmail.c

diff --git a/lib-src/cvtmail.c b/lib-src/cvtmail.c
index 83242a9..8992b3f 100644 (file)
--- a/lib-src/cvtmail.c
+++ b/lib-src/cvtmail.c
@@ -29,25 +29,24 @@ Boston, MA 02111-1307, USA.  */
  *
  * In order to get rmail to read the messages, the resulting file must
  * be mv'ed to ~/mbox, and then have rmail invoked on them.
- * 
+ *
  * Author: Larry Kolodney, 1985
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 
-#ifdef __GNU_LIBRARY__
-# include <string.h>
-#endif
-
-char *malloc ();
-char *realloc ();
+#ifndef HAVE_STDLIB_H
 char *getenv ();
+#endif
 
-char *xmalloc ();
-char *xrealloc ();
-void skip_to_lf ();
-void sysfail ();
+char *xmalloc __P ((unsigned));
+char *xrealloc __P ((char *, unsigned));
+void skip_to_lf __P ((FILE *));
+void sysfail __P ((char *));
 
 int
 main (argc, argv)
@@ -119,8 +118,8 @@ main (argc, argv)
        }
     }
   fclose (mddf);
-  fclose (mfilef);    
-  return 0;
+  fclose (mfilef);
+  return EXIT_SUCCESS;
 }
 
 void
@@ -149,7 +148,7 @@ fatal (s1, s2)
      char *s1, *s2;
 {
   error (s1, s2);
-  exit (1);
+  exit (EXIT_FAILURE);
 }
 
 void
@@ -158,14 +157,14 @@ sysfail (s)
 {
   fprintf (stderr, "cvtmail: ");
   perror (s);
-  exit (1);
+  exit (EXIT_FAILURE);
 }
 
 char *
 xmalloc (size)
      unsigned size;
 {
-  char *result = malloc (size);
+  char *result = (char *) malloc (size);
   if (!result)
     fatal ("virtual memory exhausted", 0);
   return result;
@@ -176,8 +175,13 @@ xrealloc (ptr, size)
      char *ptr;
      unsigned size;
 {
-  char *result = realloc (ptr, size);
+  char *result = (char *) realloc (ptr, size);
   if (!result)
-    fatal ("virtual memory exhausted");
+    fatal ("virtual memory exhausted", 0);
   return result;
 }
+
+/* arch-tag: b93c25a9-9012-44f1-b78b-9cc7aed44a7a
+   (do not change this comment) */
+
+/* cvtmail.c ends here */