* fileio.c (make_temp_name): Remove unreachable code.

diff --git a/src/ChangeLog b/src/ChangeLog
index 698c5bd4cd790ea67a9fcc5490f72a4a6c5974e9..40b6e0e6195340bf8289fcc5380287b89519c2e8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.

diff --git a/src/fileio.c b/src/fileio.c
index 53bc652f51d41630dc7bce1c0333ab5b6eb268aa..71870a17200976b2fe80f5bba84dd4e3f7683914 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -740,17 +740,13 @@ make_temp_name (Lisp_Object prefix, int base64_p)
               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 @@ auto_save_1 (void)
 
 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 @@ do_auto_save_unwind (Lisp_Object arg)  /* used as unwind-protect function */
 
 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 @@ This includes interactive calls to `delete-file' and
   defsubr (&Sunix_sync);
 #endif
 }
-