diff options
| author | oni-link <knil.ino@gmail.com> | 2014-04-01 17:09:53 +0200 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-04-02 18:52:16 -0300 |
| commit | c298edd5dc2484d41ea4620d1d0172042b647a36 (patch) | |
| tree | e8adb8673434d5ad4703f540ec3c08191fdd1159 | |
| parent | c30c9b275c7e4dec65fbe01b8037fc6f0227610e (diff) | |
| download | rneovim-c298edd5dc2484d41ea4620d1d0172042b647a36.tar.gz rneovim-c298edd5dc2484d41ea4620d1d0172042b647a36.tar.bz2 rneovim-c298edd5dc2484d41ea4620d1d0172042b647a36.zip | |
Replace use of mch_rename with rename.
The macro mch_rename is no longer necessary, because C99 function rename
is always available.
| -rw-r--r-- | src/fileio.c | 12 | ||||
| -rw-r--r-- | src/os_unix_defs.h | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/fileio.c b/src/fileio.c index 2341c6308d..b7e674c63c 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -5072,12 +5072,12 @@ int vim_rename(char_u *from, char_u *to) for (n = 123; n < 99999; ++n) { sprintf((char *)gettail((char_u *)tempname), "%d", n); if (mch_stat(tempname, &st) < 0) { - if (mch_rename((char *)from, tempname) == 0) { - if (mch_rename(tempname, (char *)to) == 0) + if (rename((char *)from, tempname) == 0) { + if (rename(tempname, (char *)to) == 0) return 0; /* Strange, the second step failed. Try moving the * file back and return failure. */ - mch_rename(tempname, (char *)from); + rename(tempname, (char *)from); return -1; } /* If it fails for one temp name it will most likely fail @@ -5090,8 +5090,8 @@ int vim_rename(char_u *from, char_u *to) /* * Delete the "to" file, this is required on some systems to make the - * mch_rename() work, on other systems it makes sure that we don't have - * two files when the mch_rename() fails. + * rename() work, on other systems it makes sure that we don't have + * two files when the rename() fails. */ mch_remove(to); @@ -5099,7 +5099,7 @@ int vim_rename(char_u *from, char_u *to) /* * First try a normal rename, return if it works. */ - if (mch_rename((char *)from, (char *)to) == 0) + if (rename((char *)from, (char *)to) == 0) return 0; /* diff --git a/src/os_unix_defs.h b/src/os_unix_defs.h index fd7bc66def..9ce17410b0 100644 --- a/src/os_unix_defs.h +++ b/src/os_unix_defs.h @@ -251,8 +251,6 @@ # define DFLT_MAXMEMTOT (10*1024) /* use up to 10 Mbyte for Vim */ # endif -#define mch_rename(src, dst) rename(src, dst) - #if !defined(S_ISDIR) && defined(S_IFDIR) # define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) #endif |