aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-01-16 23:07:30 -0800
committerPaul Eggert2011-01-16 23:07:30 -0800
commit410ed5c357ccc4944cbfdbb6759683b65df6568c (patch)
tree285f208c01a7efd28a96ea6c6a8b7b5144a97509 /src
parent97be3ce36c97d85b5f243cc1e1a14985164a9bf3 (diff)
downloademacs-410ed5c357ccc4944cbfdbb6759683b65df6568c.tar.gz
emacs-410ed5c357ccc4944cbfdbb6759683b65df6568c.zip
* fileio.c (make_temp_name): Remove unreachable code.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/fileio.c13
2 files changed, 6 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 698c5bd4cd7..40b6e0e6195 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12011-01-17 Paul Eggert <eggert@cs.ucla.edu> 12011-01-17 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * fileio.c (make_temp_name): Remove unreachable code.
4
3 * fontset.c (free_realized_fontset): Mark unreachable code with if (0). 5 * fontset.c (free_realized_fontset): Mark unreachable code with if (0).
4 Previously it was marked by preceding it with "return;", but 6 Previously it was marked by preceding it with "return;", but
5 Sun cc complains about this. 7 Sun cc complains about this.
diff --git a/src/fileio.c b/src/fileio.c
index 53bc652f51d..71870a17200 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -740,17 +740,13 @@ make_temp_name (Lisp_Object prefix, int base64_p)
740 as bad as (and in many cases worse than) throwing the 740 as bad as (and in many cases worse than) throwing the
741 error, or to ignore the error, which will likely result 741 error, or to ignore the error, which will likely result
742 in looping through 225307 stat's, which is not only 742 in looping through 225307 stat's, which is not only
743 dog-slow, but also useless since it will fallback to 743 dog-slow, but also useless since eventually nil would
744 the errow below, anyway. */ 744 have to be returned anyway. */
745 report_file_error ("Cannot create temporary name for prefix", 745 report_file_error ("Cannot create temporary name for prefix",
746 Fcons (prefix, Qnil)); 746 Fcons (prefix, Qnil));
747 /* not reached */ 747 /* not reached */
748 } 748 }
749 } 749 }
750
751 error ("Cannot create temporary name for prefix `%s'",
752 SDATA (prefix));
753 return Qnil;
754} 750}
755 751
756 752
@@ -5232,7 +5228,7 @@ auto_save_1 (void)
5232 5228
5233static Lisp_Object 5229static Lisp_Object
5234do_auto_save_unwind (Lisp_Object arg) /* used as unwind-protect function */ 5230do_auto_save_unwind (Lisp_Object arg) /* used as unwind-protect function */
5235 5231
5236{ 5232{
5237 FILE *stream = (FILE *) XSAVE_VALUE (arg)->pointer; 5233 FILE *stream = (FILE *) XSAVE_VALUE (arg)->pointer;
5238 auto_saving = 0; 5234 auto_saving = 0;
@@ -5247,7 +5243,7 @@ do_auto_save_unwind (Lisp_Object arg) /* used as unwind-protect function */
5247 5243
5248static Lisp_Object 5244static Lisp_Object
5249do_auto_save_unwind_1 (Lisp_Object value) /* used as unwind-protect function */ 5245do_auto_save_unwind_1 (Lisp_Object value) /* used as unwind-protect function */
5250 5246
5251{ 5247{
5252 minibuffer_auto_raise = XINT (value); 5248 minibuffer_auto_raise = XINT (value);
5253 return Qnil; 5249 return Qnil;
@@ -5873,4 +5869,3 @@ This includes interactive calls to `delete-file' and
5873 defsubr (&Sunix_sync); 5869 defsubr (&Sunix_sync);
5874#endif 5870#endif
5875} 5871}
5876