diff --git a/ext/standard/link.c b/ext/standard/link.c index c63f7ff268343..58098d14e8799 100644 --- a/ext/standard/link.c +++ b/ext/standard/link.c @@ -75,7 +75,7 @@ PHP_FUNCTION(readlink) if (ret == -1) { #ifdef PHP_WIN32 - php_error_docref(NULL, E_WARNING, "readlink failed to read the symbolic link (%s), error %d)", link, GetLastError()); + php_error_docref(NULL, E_WARNING, "readlink failed to read the symbolic link (%s), error %d", link, GetLastError()); #else php_error_docref(NULL, E_WARNING, "%s", strerror(errno)); #endif diff --git a/ext/standard/tests/file/readlink_realpath_error-win32.phpt b/ext/standard/tests/file/readlink_realpath_error-win32.phpt index c49beb2edae0b..afb5e987d7fe7 100644 --- a/ext/standard/tests/file/readlink_realpath_error-win32.phpt +++ b/ext/standard/tests/file/readlink_realpath_error-win32.phpt @@ -25,7 +25,7 @@ echo "Done\n"; --EXPECTF-- *** Testing readlink() on a non-existent link *** -Warning: readlink(): readlink failed to read the symbolic link (%s, error %d) in %s on line %d +Warning: readlink(): readlink failed to read the symbolic link (%s), error %d in %s on line %d bool(false) *** Testing readlink() on existing file *** diff --git a/ext/standard/tests/file/readlink_realpath_variation2-win32.phpt b/ext/standard/tests/file/readlink_realpath_variation2-win32.phpt index aea1fd0cc0871..f1f561538179e 100644 --- a/ext/standard/tests/file/readlink_realpath_variation2-win32.phpt +++ b/ext/standard/tests/file/readlink_realpath_variation2-win32.phpt @@ -76,7 +76,7 @@ string(%d) "%s%ereadlink_realpath_variation2%ehome%etests%elink%ereadlink_realpa Warning: symlink(): No such file or directory in %s on line %d bool(false) -Warning: readlink(): readlink failed to read the symbolic link (%s) in %s on line %d +Warning: readlink(): readlink failed to read the symbolic link (%s), error %d in %s on line %d bool(false) bool(false) @@ -90,7 +90,7 @@ string(%d) "%s%ereadlink_realpath_variation2%ehome%etests%elink%ereadlink_realpa Warning: link(): No such file or directory in %s on line %d bool(false) -Warning: readlink(): readlink failed to read the symbolic link (%s) in %s on line %d +Warning: readlink(): readlink failed to read the symbolic link (%s), error %d in %s on line %d bool(false) bool(false) diff --git a/ext/standard/tests/file/rename_variation7-win32.phpt b/ext/standard/tests/file/rename_variation7-win32.phpt index bf879ce7d92d1..9e94c43cc5c03 100644 --- a/ext/standard/tests/file/rename_variation7-win32.phpt +++ b/ext/standard/tests/file/rename_variation7-win32.phpt @@ -28,9 +28,9 @@ echo "Done\n"; --EXPECTF-- Warning: symlink(): No such file or directory in %srename_variation7-win32.php on line %d -Warning: readlink(): readlink failed to read the symbolic link (%srename_variation7-win32.php.tmp.link), error 2) in %srename_variation7-win32.php on line %d +Warning: readlink(): readlink failed to read the symbolic link (%srename_variation7-win32.php.tmp.link), error 2 in %srename_variation7-win32.php on line %d bool(false) -Warning: readlink(): readlink failed to read the symbolic link (%srename_variation7-win32.php.tmp.link2), error 2) in %srename_variation7-win32.php on line %d +Warning: readlink(): readlink failed to read the symbolic link (%srename_variation7-win32.php.tmp.link2), error 2 in %srename_variation7-win32.php on line %d bool(false) Done