From 9baf84e513eddab4479f794643eae0ab05491fee Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 15 Dec 2017 15:00:20 +0100 Subject: [PATCH] Drop unused code --- win32/ioutil.c | 17 ----------------- win32/ioutil.h | 17 ----------------- 2 files changed, 34 deletions(-) diff --git a/win32/ioutil.c b/win32/ioutil.c index 11761ce9d9..a2a5e74b3b 100644 --- a/win32/ioutil.c +++ b/win32/ioutil.c @@ -670,9 +670,6 @@ PW32IO FILE *php_win32_ioutil_fopen_w(const wchar_t *path, const wchar_t *mode) {/*{{{*/ FILE *ret; char modea[16] = {0}; -#if 0 - char *modea; -#endif int err = 0, fd, flags, i = 0; PHP_WIN32_IOUTIL_CHECK_PATH_W(path, NULL, 0) @@ -682,24 +679,10 @@ PW32IO FILE *php_win32_ioutil_fopen_w(const wchar_t *path, const wchar_t *mode) modea[i] = (char)mode[i]; i++; } -#if 0 - modea = php_win32_cp_w_to_any(mode); - if (!modea) { - err = GetLastError(); - SET_ERRNO_FROM_WIN32_CODE(err); - return NULL; - } -#endif if (SUCCESS != php_stream_parse_fopen_modes(modea, &flags)) { -#if 0 - free(modea); -#endif SET_ERRNO_FROM_WIN32_CODE(ERROR_INVALID_PARAMETER); return NULL; } -#if 0 - free(modea); -#endif fd = php_win32_ioutil_open_w(path, flags, 0666); if (0 > fd) { diff --git a/win32/ioutil.h b/win32/ioutil.h index 301566ddda..36017cb497 100644 --- a/win32/ioutil.h +++ b/win32/ioutil.h @@ -376,9 +376,6 @@ __forceinline static FILE *php_win32_ioutil_fopen(const char *patha, const char {/*{{{*/ FILE *ret; wchar_t modew[16] = {0}; -#if 0 - wchar_t *modew; -#endif int err = 0, i = 0; PHP_WIN32_IOUTIL_INIT_W(patha) @@ -393,30 +390,16 @@ __forceinline static FILE *php_win32_ioutil_fopen(const char *patha, const char modew[i] = (wchar_t)modea[i]; i++; } -#if 0 - modew = php_win32_cp_ascii_to_w(modea); - if (!modew) { - PHP_WIN32_IOUTIL_CLEANUP_W() - SET_ERRNO_FROM_WIN32_CODE(ERROR_INVALID_PARAMETER); - return NULL; - } -#endif ret = php_win32_ioutil_fopen_w(pathw, modew); if (!ret) { err = GetLastError(); PHP_WIN32_IOUTIL_CLEANUP_W() -#if 0 - free(modew); -#endif SET_ERRNO_FROM_WIN32_CODE(err); return NULL; } PHP_WIN32_IOUTIL_CLEANUP_W() -#if 0 - free(modew); -#endif return ret; }/*}}}*/ -- 2.50.1