]> granicus.if.org Git - php/commitdiff
Sync with the POSIX signature
authorAnatol Belski <ab@php.net>
Mon, 27 Nov 2017 13:01:55 +0000 (14:01 +0100)
committerAnatol Belski <ab@php.net>
Tue, 28 Nov 2017 08:15:14 +0000 (09:15 +0100)
win32/ioutil.h

index a22ca3eb1439ef731a8d10833fffdc9fe1baef48..01e8e2319bc84271a9240bece7a1b84d6c37a5d5 100644 (file)
@@ -466,14 +466,14 @@ __forceinline static int php_win32_ioutil_chdir(const char *patha)
        return ret;
 }/*}}}*/
 
-__forceinline static char *php_win32_ioutil_getcwd(char *buf, int len)
+__forceinline static char *php_win32_ioutil_getcwd(char *buf, size_t len)
 {/*{{{*/
        wchar_t tmp_bufw[PHP_WIN32_IOUTIL_MAXPATHLEN];
        char *tmp_bufa = NULL;
        size_t tmp_bufa_len;
        DWORD err = 0;
 
-       if (php_win32_ioutil_getcwd_w(tmp_bufw, PHP_WIN32_IOUTIL_MAXPATHLEN) == NULL) {
+       if (php_win32_ioutil_getcwd_w(tmp_bufw, len) == NULL) {
                err = GetLastError();
                SET_ERRNO_FROM_WIN32_CODE(err);
                return NULL;
@@ -494,7 +494,7 @@ __forceinline static char *php_win32_ioutil_getcwd(char *buf, int len)
                /* If buf was NULL, the result has to be freed outside here. */
                buf = tmp_bufa;
        } else {
-               if (tmp_bufa_len + 1 > (size_t)len) {
+               if (tmp_bufa_len + 1 > len) {
                        free(tmp_bufa);
                        SET_ERRNO_FROM_WIN32_CODE(ERROR_INSUFFICIENT_BUFFER);
                        return NULL;