[Emacs-diffs] /srv/bzr/emacs/trunk r102873: * fileio.c (make_temp_name): Remove unreachable code.

[Paul Eggert]

------------------------------------------------------------
revno: 102873 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2011-01-16 23:08:57 -0800
message:
  * fileio.c (make_temp_name): Remove unreachable code.
modified:
  src/ChangeLog
  src/fileio.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-01-17 03:05:08 +0000
+++ b/src/ChangeLog     2011-01-17 07:07:30 +0000
@@ -1,5 +1,7 @@
 2011-01-17  Paul Eggert  <address@hidden>
 
+       * 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.

=== modified file 'src/fileio.c'
--- a/src/fileio.c      2011-01-16 02:21:30 +0000
+++ b/src/fileio.c      2011-01-17 07:07:30 +0000
@@ -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
 }
-