Merged from miles@gnu.org--gnu-2005 (patch 70-73, 320-331)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-320
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-321
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-322
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-323
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-324
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-325
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-326
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-327
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-328
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-329
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-330
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-331
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-70
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-71
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-72
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-73
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-348

2 files changed, 8 insertions, 3 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 1370f05a9d6..aa9d3fe7fc6 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-25  Thien-Thi Nguyen  <ttn@gnu.org>
+
+        * yow.c (setup_yow): Use EXIT_FAILURE in case no separators found.
+        (yow): Use EXIT_FAILURE in case of memory error.
+
 2005-05-13  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * make-docfile.c (DIRECTORY_SEP): New macro.
diff --git a/lib-src/yow.c b/lib-src/yow.c
index 9d58ce5aecb..1356ac6db18 100644
--- a/lib-src/yow.c
+++ b/lib-src/yow.c
@@ -104,7 +104,7 @@ setup_yow(fp)
   while ((c = getc(fp)) != SEP) {
     if (c == EOF) {
       fprintf(stderr, "yow: file contains no separators\n");
-      exit(2);
+      exit(EXIT_FAILURE);
     }
   }
   header_len = ftell(fp);
@@ -157,7 +157,7 @@ yow (fp)
   buf = (char *) malloc(bufsize);
   if (buf == (char *)0) {
     fprintf(stderr, "yow: virtual memory exhausted\n");
-    exit (3);
+    exit (EXIT_FAILURE);
   }
 
   buf[i++] = c;
@@ -170,7 +170,7 @@ yow (fp)
       buf = (char *) realloc(buf, bufsize);
       if (buf == (char *)0) {
         fprintf(stderr, "yow: virtual memory exhausted\n");
-        exit (3);
+        exit (EXIT_FAILURE);
       }
     }
   }