From: Andreas Schwab <schwab@suse.de>
Date: Tue, 2 Sep 2008 08:13:20 +0000 (+0000)
Subject: (Fexpand_file_name): Remove unused variables.
X-Git-Tag: emacs-pretest-23.0.90~3075
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7a3cddefca08dcdf93bddb81f21558d53ae6c2e4;p=emacs.git

(Fexpand_file_name): Remove unused variables.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index e8e50319c12..6181aeb59dc 100644
--- 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 ad8f7d7a538..9c6b98d83f5 100644
--- 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;