Mercurial > emacs
changeset 112297:428d3d3b9f96
* fileio.c (make_temp_name): Remove unreachable code.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Sun, 16 Jan 2011 23:08:57 -0800 |
| parents | a3ee86732163 (current diff) d10e4c917525 (diff) |
| children | 8ed3ecdb4fd4 |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Jan 16 19:06:11 2011 -0800 +++ b/src/ChangeLog Sun Jan 16 23:08:57 2011 -0800 @@ -1,5 +1,7 @@ 2011-01-17 Paul Eggert <eggert@cs.ucla.edu> + * fileio.c (make_temp_name): Remove unreachable code. + * fontset.c (free_realized_fontset): Mark unreachable code with if (0). Previously it was marked by preceding it with "return;", but Sun cc complains about this.
--- a/src/fileio.c Sun Jan 16 19:06:11 2011 -0800 +++ b/src/fileio.c Sun Jan 16 23:08:57 2011 -0800 @@ -740,17 +740,13 @@ as bad as (and in many cases worse than) throwing the error, or to ignore the error, which will likely result in looping through 225307 stat's, which is not only - dog-slow, but also useless since it will fallback to - the errow below, anyway. */ + dog-slow, but also useless since eventually nil would + have to be returned anyway. */ report_file_error ("Cannot create temporary name for prefix", Fcons (prefix, Qnil)); /* not reached */ } } - - error ("Cannot create temporary name for prefix `%s'", - SDATA (prefix)); - return Qnil; } @@ -5232,7 +5228,7 @@ static Lisp_Object do_auto_save_unwind (Lisp_Object arg) /* used as unwind-protect function */ - + { FILE *stream = (FILE *) XSAVE_VALUE (arg)->pointer; auto_saving = 0; @@ -5247,7 +5243,7 @@ static Lisp_Object do_auto_save_unwind_1 (Lisp_Object value) /* used as unwind-protect function */ - + { minibuffer_auto_raise = XINT (value); return Qnil; @@ -5873,4 +5869,3 @@ defsubr (&Sunix_sync); #endif } -