[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: Both: Error messages
From: |
Akim Demaille |
Subject: |
FYI: Both: Error messages |
Date: |
26 Nov 2001 12:27:05 +0100 |
User-agent: |
Gnus/5.0808 (Gnus v5.8.8) XEmacs/21.4 (Artificial Intelligence) |
Index: ChangeLog
from Akim Demaille <address@hidden>
* src/complain.c, src/complain.h (error): Remove, provided by
lib/error.[ch].
Index: NEWS
===================================================================
RCS file: /cvsroot/bison/bison/NEWS,v
retrieving revision 1.21.2.29
diff -u -u -r1.21.2.29 NEWS
--- NEWS 2001/11/26 09:18:40 1.21.2.29
+++ NEWS 2001/11/26 11:25:53
@@ -3,6 +3,9 @@
Changes in version 1.30e:
+* Error messages
+ Some calls to strerror resulted in scrambled or missing error messages.
+
* %expect
When the number of shift/reduce conflicts is correct, don't issue
any warning.
Index: src/complain.c
===================================================================
RCS file: /cvsroot/bison/bison/src/complain.c,v
retrieving revision 1.4.2.1
diff -u -u -r1.4.2.1 complain.c
--- src/complain.c 2001/09/20 17:08:42 1.4.2.1
+++ src/complain.c 2001/11/26 11:25:53
@@ -1,5 +1,5 @@
/* Declaration for error-reporting function for Bison.
- Copyright 2000 Free Software Foundation, Inc.
+ Copyright 2000, 2001 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
@@ -247,63 +247,4 @@
putc ('\n', stderr);
fflush (stderr);
exit (1);
-}
-
-/*------------------------------------------------------------------.
-| A severe error has occurred, we cannot proceed. Exit with STATUS, |
-| and report the error message of the errno ERRNUM. |
-`------------------------------------------------------------------*/
-
-void
-#if defined VA_START && defined __STDC__
-error (int status, int errnum,
- const char *message, ...)
-#else
-error (status, errnum, message, va_alist)
- int status;
- int errnum;
- char *message;
- va_dcl
-#endif
-{
-#ifdef VA_START
- va_list args;
-#endif
-
- fflush (stdout);
- if (infile != NULL)
- fprintf (stderr, "%s:%d: ", infile, lineno);
- else
- fprintf (stderr, "%s:", program_name);
-
- fputs (_("fatal error: "), stderr);
-
-#ifdef VA_START
- VA_START (args, message);
- vfprintf (stderr, message, args);
- va_end (args);
-#else
- fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif
-
- if (errnum)
- {
-#if defined HAVE_STRERROR_R || _LIBC
- char errbuf[1024];
-# if HAVE_WORKING_STRERROR_R || _LIBC
- fprintf (stderr, ": %s", __strerror_r (errnum, errbuf, sizeof errbuf));
-# else
- /* Don't use __strerror_r's return value because on some systems
- (at least DEC UNIX 4.0[A-D]) strerror_r returns `int'. */
- __strerror_r (errnum, errbuf, sizeof errbuf);
- fprintf (stderr, ": %s", errbuf);
-# endif
-#else
- fprintf (stderr, ": %s", strerror (errnum));
-#endif
- }
- putc ('\n', stderr);
- fflush (stderr);
- if (status)
- exit (status);
}
Index: src/complain.h
===================================================================
RCS file: /cvsroot/bison/bison/src/complain.h,v
retrieving revision 1.2.2.1
diff -u -u -r1.2.2.1 complain.h
--- src/complain.h 2001/09/20 17:08:42 1.2.2.1
+++ src/complain.h 2001/11/26 11:25:53
@@ -1,5 +1,5 @@
/* Declaration for error-reporting function for Bison.
- Copyright 2000 Free Software Foundation, Inc.
+ Copyright 2000, 2001 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
@@ -40,18 +40,10 @@
extern void fatal (const char *format, ...)
__attribute__ ((__format__ (__printf__, 1, 2)));
-/* Print a message with `fprintf (stderr, FORMAT, ...)';
- if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
- If STATUS is nonzero, terminate the program with `exit (STATUS)'. */
-
-extern void error (int status, int errnum,
- const char *format, ...)
- __attribute__ ((__format__ (__printf__, 3, 4)));
-
#else
void warn ();
void complain ();
-void error ();
+void fatal ();
#endif
/* Position in the current input file. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: Both: Error messages,
Akim Demaille <=