(libbison_a_SOURCES): Add mbswidth.h, mbswidth.c.

[bison.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index dd3ec8180a68eb72f0c143939ac46029300a90f0..da4c36b1e9a865ed82ac3209efe7df744e63ba3f 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -111,7 +111,7 @@ xfopen (const char *name, const char *mode)
 
   ptr = fopen (name, mode);
   if (!ptr)
 
   ptr = fopen (name, mode);
   if (!ptr)

-    error (2, errno, _("cannot open file `%s'"), name);
+    error (EXIT_FAILURE, errno, _("cannot open file `%s'"), name);

 
   return ptr;
 }
 
   return ptr;
 }


@@ -120,19 +120,17 @@ xfopen (const char *name, const char *mode)
 | Try to close file PTR, and print an error message if fails.  |
 `-------------------------------------------------------------*/
 
 | Try to close file PTR, and print an error message if fails.  |
 `-------------------------------------------------------------*/
 

-int
+void

 xfclose (FILE *ptr)
 {
 xfclose (FILE *ptr)
 {

-  int result;
-

   if (ptr == NULL)
   if (ptr == NULL)

-    return 0;
+    return;

 
 

-  result = fclose (ptr);
-  if (result == EOF)
-    error (2, errno, _("cannot close file"));
+  if (ferror (ptr))
+    error (EXIT_FAILURE, 0, _("I/O error"));

 
 

-  return result;
+  if (fclose (ptr) != 0)
+    error (EXIT_FAILURE, errno, _("cannot close file"));

 }
 \f
 
 }
 \f