Mercurial > hg > xemacs-beta
diff src/fileio.c @ 4982:3c3c1d139863
Automatic merge
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Fri, 05 Feb 2010 11:25:00 -0600 |
parents | 4aebb0131297 16112448d484 |
children | 44d7bde26046 |
line wrap: on
line diff
--- a/src/fileio.c Fri Feb 05 11:02:24 2010 -0600 +++ b/src/fileio.c Fri Feb 05 11:25:00 2010 -0600 @@ -399,7 +399,7 @@ return Qnil; } if (wd) - xfree (wd, Ibyte *); + xfree (wd); } #if 0 /* No! This screws up efs, which calls file-name-directory on URL's @@ -942,7 +942,7 @@ XSTRING_DATA (name)[1] = ':'; } } - xfree (newnm, Ibyte *); + xfree (newnm); RETURN_UNGCPRO_EXIT_PROFILING (QSin_expand_file_name, name); } #endif /* WIN32_FILENAMES */ @@ -1055,7 +1055,7 @@ if (newcwd) { IBYTE_STRING_TO_ALLOCA (newcwd, newdir); - xfree (newcwd, Ibyte *); + xfree (newcwd); } else newdir = NULL; @@ -1141,7 +1141,7 @@ if (newcwd) { IBYTE_STRING_TO_ALLOCA (newcwd, newdir); - xfree (newcwd, Ibyte *); + xfree (newcwd); } else #endif @@ -1316,7 +1316,7 @@ { Ibyte *newtarget = mswindows_canonicalize_filename (target); Lisp_Object result = build_istring (newtarget); - xfree (newtarget, Ibyte *); + xfree (newtarget); RETURN_UNGCPRO_EXIT_PROFILING (QSin_expand_file_name, result); } @@ -2552,16 +2552,16 @@ buf, bufsize); if (valsize < bufsize) break; /* Buffer was not long enough */ - xfree (buf, Ibyte *); + xfree (buf); bufsize *= 2; } if (valsize == -1) { - xfree (buf, Ibyte *); + xfree (buf); return Qnil; } val = make_string (buf, valsize); - xfree (buf, Ibyte *); + xfree (buf); return val; #elif defined (WIN32_NATIVE) if (mswindows_shortcuts_are_symlinks) @@ -2591,7 +2591,7 @@ return Qnil; { Lisp_Object val = build_istring (fname); - xfree (fname, Ibyte *); + xfree (fname); return val; } }