From: Anatol Belski <ab@php.net>
Date: Sun, 9 Jul 2017 14:23:31 +0000 (+0200)
Subject: comply with POSIX signature
X-Git-Tag: php-7.2.0beta1~105
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba5df1c68202486a4043d44e11e132656789bae3;p=php

comply with POSIX signature
---

diff --git a/win32/ioutil.c b/win32/ioutil.c
index 9c0601af97..a3f8f251b9 100644
--- a/win32/ioutil.c
+++ b/win32/ioutil.c
@@ -395,14 +395,15 @@ PW32IO int php_win32_ioutil_rename_w(const wchar_t *oldname, const wchar_t *newn
 	return ret;
 }/*}}}*/
 
-PW32IO wchar_t *php_win32_ioutil_getcwd_w(const wchar_t *buf, int len)
+PW32IO wchar_t *php_win32_ioutil_getcwd_w(wchar_t *buf, size_t len)
 {/*{{{*/
 	DWORD err = 0;
 	wchar_t *tmp_buf = NULL;
+	DWORD tmp_len;
 
 	/* If buf was NULL, the result has to be freed outside here. */
 	if (!buf) {
-		DWORD tmp_len = GetCurrentDirectoryW(0, NULL) + 1;
+		tmp_len = GetCurrentDirectoryW(0, NULL) + 1;
 		if (!tmp_len) {
 			err = GetLastError();
 			SET_ERRNO_FROM_WIN32_CODE(err);
@@ -412,9 +413,7 @@ PW32IO wchar_t *php_win32_ioutil_getcwd_w(const wchar_t *buf, int len)
 			return NULL;
 		}
 
-		len = tmp_len;
-
-		tmp_buf = (wchar_t *)malloc((len)*sizeof(wchar_t));
+		tmp_buf = (wchar_t *)malloc((tmp_len)*sizeof(wchar_t));
 		if (!tmp_buf) {
 			SET_ERRNO_FROM_WIN32_CODE(ERROR_NOT_ENOUGH_MEMORY);
 			return NULL;
@@ -422,7 +421,7 @@ PW32IO wchar_t *php_win32_ioutil_getcwd_w(const wchar_t *buf, int len)
 		buf = tmp_buf;
 	}
 	
-	if (!GetCurrentDirectoryW(len, buf)) {
+	if (!GetCurrentDirectoryW(tmp_len, buf)) {
 		err = GetLastError();
 		SET_ERRNO_FROM_WIN32_CODE(err);
 		free(tmp_buf);
diff --git a/win32/ioutil.h b/win32/ioutil.h
index 8298912a0e..9987744626 100644
--- a/win32/ioutil.h
+++ b/win32/ioutil.h
@@ -222,7 +222,7 @@ PW32IO size_t php_win32_ioutil_dirname(char *buf, size_t len);
 PW32IO int php_win32_ioutil_open_w(const wchar_t *path, int flags, ...);
 PW32IO int php_win32_ioutil_chdir_w(const wchar_t *path);
 PW32IO int php_win32_ioutil_rename_w(const wchar_t *oldname, const wchar_t *newname);
-PW32IO wchar_t *php_win32_ioutil_getcwd_w(const wchar_t *buf, int len);
+PW32IO wchar_t *php_win32_ioutil_getcwd_w(wchar_t *buf, size_t len);
 
 #if 0
 PW32IO int php_win32_ioutil_mkdir_w(const wchar_t *path, mode_t mode);