(Fexpand_file_name): Remove unused variables.

diff --git a/src/ChangeLog b/src/ChangeLog
index e8e50319c12e753206257d7e34c482574c500477..6181aeb59dcc7353e3aa7e33a002257da28831d5 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-02  Andreas Schwab  <schwab@suse.de>
+
+       * fileio.c (Fexpand_file_name): Remove unused variables.
+
 2008-09-02  Eli Zaretskii  <eliz@gnu.org>
 
        * fileio.c (Fexpand_file_name): Copy argument `name' into local

diff --git a/src/fileio.c b/src/fileio.c
index ad8f7d7a538a5f58b419a256f2dbfc0360cb9c85..9c6b98d83f51169ca81650a7a1d437ec953350b0 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -824,7 +824,6 @@ See also the function `substitute-in-file-name'.  */)
   /* These point to SDATA and need to be careful with string-relocation
      during GC (via DECODE_FILE).  */
   unsigned char *nm, *newdir;
-  int nm_in_name;
   /* This should only point to alloca'd data.  */
   unsigned char *target;
 
@@ -930,11 +929,9 @@ See also the function `substitute-in-file-name'.  */)
     }
 
   nm = SDATA (name);
-  nm_in_name = 1;
 
   /* Make a local copy of nm[] to protect it from GC in DECODE_FILE below. */
   nm = strcpy (alloca (strlen (nm) + 1), nm);
-  nm_in_name = 0;
 
 #ifdef DOS_NT
   /* Note if special escape prefix is present, but remove for now.  */
@@ -1077,13 +1074,8 @@ See also the function `substitute-in-file-name'.  */)
          tem = build_string (newdir);
          if (!STRING_MULTIBYTE (tem))
            {
-             /* FIXME: DECODE_FILE may GC, which may move SDATA(name),
-                after which `nm' won't point to the right place any more.  */
-             int offset = nm - SDATA (name);
              hdir = DECODE_FILE (tem);
              newdir = SDATA (hdir);
-             if (nm_in_name)
-             nm = SDATA (name) + offset;
            }
 #ifdef DOS_NT
          collapse_newdir = 0;