Mercurial > emacs
changeset 97948:9d28724e2c52
(Fexpand_file_name): Remove unused variables.
| author | Andreas Schwab <schwab@suse.de> |
|---|---|
| date | Tue, 02 Sep 2008 08:13:20 +0000 |
| parents | ab6494b53df0 |
| children | e763543ca817 |
| files | src/ChangeLog src/fileio.c |
| diffstat | 2 files changed, 4 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Sep 02 05:35:54 2008 +0000 +++ b/src/ChangeLog Tue Sep 02 08:13:20 2008 +0000 @@ -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
--- a/src/fileio.c Tue Sep 02 05:35:54 2008 +0000 +++ b/src/fileio.c Tue Sep 02 08:13:20 2008 +0000 @@ -824,7 +824,6 @@ /* 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 @@ } 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 @@ 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;