diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-07-24 13:49:22 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-07-24 13:49:22 +0200 |
| commit | e24a9c0b592a11743475166c873a5c346c65f73d (patch) | |
| tree | b0382290595151194b21c01a4caa433bd7895e16 | |
| parent | 196ed14d15f27d91856fd2f415da53f3f5db6c10 (diff) | |
| download | vim-git-e24a9c0b592a11743475166c873a5c346c65f73d.tar.gz | |
updated for version 7.4a.040v7.4a.040
Problem: Win32: using uninitialized variable.
Solution: (Yukihiro Nakadaira)
| -rw-r--r-- | src/os_win32.c | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index db3c794da..48cc4c5dc 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -2717,21 +2717,19 @@ mch_getperm(char_u *name) /* - * set file permission for `name' to `perm' + * Set file permission for "name" to "perm". * - * return FAIL for failure, OK otherwise + * Return FAIL for failure, OK otherwise. */ int -mch_setperm( - char_u *name, - long perm) +mch_setperm(char_u *name, long perm) { - long n; + long n = -1; + #ifdef FEAT_MBYTE - WCHAR *p; if (enc_codepage >= 0 && (int)GetACP() != enc_codepage) { - p = enc_to_utf16(name, NULL); + WCHAR *p = enc_to_utf16(name, NULL); if (p != NULL) { @@ -2742,7 +2740,7 @@ mch_setperm( /* Retry with non-wide function (for Windows 98). */ } } - if (p == NULL) + if (n == -1) #endif n = _chmod(name, perm); if (n == -1) diff --git a/src/version.c b/src/version.c index f1d5214a1..f35c8b904 100644 --- a/src/version.c +++ b/src/version.c @@ -728,6 +728,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 40, +/**/ 39, /**/ 38, |