summaryrefslogtreecommitdiff
path: root/lib-src
diff options
context:
space:
mode:
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog11
-rw-r--r--lib-src/ebrowse.c2
-rw-r--r--lib-src/emacsclient.c2
-rw-r--r--lib-src/fakemail.c10
4 files changed, 19 insertions, 6 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index e792753b748..6be0910d27a 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,14 @@
+2006-07-20 Andreas Schwab <schwab@suse.de>
+
+ * fakemail.c (fatal): Drop second parameter and treat first
+ parameter as a plain string. Callers changed.
+
+2006-07-18 Dan Nicolaescu <dann@ics.uci.edu>
+
+ * ebrowse.c (usage, version): Mark as NO_RETURN.
+
+ * emacsclient.c (print_help_and_exit): Likewise.
+
2006-07-10 Francesco Potort,Al(B <pot@gnu.org>
* etags.c (absolute_filename): Free unused space (cosmetic change).
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index 398dd10896e..1880f1655ee 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -533,6 +533,8 @@ struct sym *parse_qualified_ident_or_type P_ ((char **));
void parse_qualified_param_ident_or_type P_ ((char **));
int globals P_ ((int));
void yyerror P_ ((char *, char *));
+void usage P_ ((int)) NO_RETURN;
+void version P_ (()) NO_RETURN;
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 870a39b9101..3d15a06b147 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -106,7 +106,7 @@ const char * alternate_editor = NULL;
/* If non-NULL, the filename of the UNIX socket. */
char *socket_name = NULL;
-void print_help_and_exit ();
+void print_help_and_exit () NO_RETURN;
struct option longopts[] =
{
diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
index 30d39db533e..be9d6e09bae 100644
--- a/lib-src/fakemail.c
+++ b/lib-src/fakemail.c
@@ -175,10 +175,10 @@ error (s1, s2)
/* Print error message and exit. */
static void
-fatal (s1, s2)
- char *s1, *s2;
+fatal (s1)
+ char *s1;
{
- error (s1, s2);
+ error ("%s", s1);
exit (EXIT_FAILURE);
}
@@ -190,7 +190,7 @@ xmalloc (size)
{
long *result = (long *) malloc (((unsigned) size));
if (result == ((long *) NULL))
- fatal ("virtual memory exhausted", 0);
+ fatal ("virtual memory exhausted");
return result;
}
@@ -377,7 +377,7 @@ make_file_preface ()
tm = localtime (&idiotic_interface);
if (! (tm && TM_YEAR_IN_ASCTIME_RANGE (tm->tm_year)
&& (the_date = asctime (tm))))
- fatal ("current time is out of range", 0);
+ fatal ("current time is out of range");
/* the_date has an unwanted newline at the end */
date_length = strlen (the_date) - 1;
the_date[date_length] = '\0';