diff options
| author | Karoly Lorentey <[email protected]> | 2005-02-10 20:43:55 +0000 |
|---|---|---|
| committer | Karoly Lorentey <[email protected]> | 2005-02-10 20:43:55 +0000 |
| commit | bdfec2134d38a605c95baab0e38ef321a6b1d59e (patch) | |
| tree | f2c616c523590a8a8f294ea3c6258d72f5de86a1 /lib-src | |
| parent | fc8bcb58bc6e96beed7ad20bae40d28d3d2ea058 (diff) | |
| parent | d25e21dddcd4df58a4029f106ad7eea82c5726dd (diff) | |
Merged from [email protected] (patch 12-13, 79-90)
Patches applied:
* [email protected]/emacs--cvs-trunk--0--patch-79
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-80
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-81
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-82
Merge from gnus--rel--5.10
* [email protected]/emacs--cvs-trunk--0--patch-83
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-84
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-85
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-86
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-87
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-88
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-89
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-90
Update from CVS: man/calc.texi: Add macro for LaTeX for info output.
* [email protected]/gnus--rel--5.10--patch-12
Merge from emacs--cvs-trunk--0
* [email protected]/gnus--rel--5.10--patch-13
Update from CVS
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-290
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 10 | ||||
| -rw-r--r-- | lib-src/movemail.c | 17 |
2 files changed, 18 insertions, 9 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 503a8bead0..4ffa38482c 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,13 @@ +2005-02-04 Andreas Schwab <[email protected]> + + * movemail.c (fatal): Accept third parameter and pass down to + error. + (pfatal_with_name): Pass error string as format parameter instead + of as part of format string. + (pfatal_and_delete): Likewise. + (main): Adjust call to fatal. + (xmalloc): Likewise. + 2005-01-29 Richard M. Stallman <[email protected]> * movemail.c (popmail): Don't use Errmsg as format string. diff --git a/lib-src/movemail.c b/lib-src/movemail.c index 46c47a97bd..e4243a1bd6 100644 --- a/lib-src/movemail.c +++ b/lib-src/movemail.c @@ -245,7 +245,7 @@ main (argc, argv) #endif if (*outname == 0) - fatal ("Destination file name is empty", 0); + fatal ("Destination file name is empty", 0, 0); /* Check access to output file. */ if (access (outname, F_OK) == 0 && access (outname, W_OK) != 0) @@ -601,12 +601,12 @@ mail_spool_name (inname) /* Print error message and exit. */ void -fatal (s1, s2) - char *s1, *s2; +fatal (s1, s2, s3) + char *s1, *s2, *s3; { if (delete_lockname) unlink (delete_lockname); - error (s1, s2, 0); + error (s1, s2, s3); exit (EXIT_FAILURE); } @@ -631,17 +631,16 @@ void pfatal_with_name (name) char *name; { - char *s = concat ("", strerror (errno), " for %s"); - fatal (s, name); + fatal ("%s for %s", strerror (errno), name); } void pfatal_and_delete (name) char *name; { - char *s = concat ("", strerror (errno), " for %s"); + char *s = strerror (errno); unlink (name); - fatal (s, name); + fatal ("%s for %s", s, name); } /* Return a newly-allocated string whose contents concatenate those of s1, s2, s3. */ @@ -669,7 +668,7 @@ xmalloc (size) { long *result = (long *) malloc (size); if (!result) - fatal ("virtual memory exhausted", 0); + fatal ("virtual memory exhausted", 0, 0); return result; } |