Skip to content

Commit 5648200

Browse files
committed
Convert docref2 to normal docref in streams/plain_wrapper.c
1 parent 162c1f7 commit 5648200

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

main/streams/plain_wrapper.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,15 +1214,15 @@ static int php_plain_files_rename(php_stream_wrapper *wrapper, const char *url_f
12141214
* access to the file in the meantime.
12151215
*/
12161216
if (VCWD_CHOWN(url_to, sb.st_uid, sb.st_gid)) {
1217-
php_error_docref2(NULL, url_from, url_to, E_WARNING, "%s", strerror(errno));
1217+
php_error_docref(NULL, E_WARNING, "%s from %s to %s", strerror(errno), url_from, url_to);
12181218
if (errno != EPERM) {
12191219
success = 0;
12201220
}
12211221
}
12221222

12231223
if (success) {
12241224
if (VCWD_CHMOD(url_to, sb.st_mode)) {
1225-
php_error_docref2(NULL, url_from, url_to, E_WARNING, "%s", strerror(errno));
1225+
php_error_docref(NULL, E_WARNING, "%s from %s to %s", strerror(errno), url_from, url_to);
12261226
if (errno != EPERM) {
12271227
success = 0;
12281228
}
@@ -1233,10 +1233,10 @@ static int php_plain_files_rename(php_stream_wrapper *wrapper, const char *url_f
12331233
VCWD_UNLINK(url_from);
12341234
}
12351235
} else {
1236-
php_error_docref2(NULL, url_from, url_to, E_WARNING, "%s", strerror(errno));
1236+
php_error_docref(NULL, E_WARNING, "%s from %s to %s", strerror(errno), url_from, url_to);
12371237
}
12381238
} else {
1239-
php_error_docref2(NULL, url_from, url_to, E_WARNING, "%s", strerror(errno));
1239+
php_error_docref(NULL, E_WARNING, "%s from %s to %s", strerror(errno), url_from, url_to);
12401240
}
12411241
# if !defined(ZTS) && !defined(TSRM_WIN32)
12421242
umask(oldmask);
@@ -1249,7 +1249,7 @@ static int php_plain_files_rename(php_stream_wrapper *wrapper, const char *url_f
12491249
#ifdef PHP_WIN32
12501250
php_win32_docref2_from_error(GetLastError(), url_from, url_to);
12511251
#else
1252-
php_error_docref2(NULL, url_from, url_to, E_WARNING, "%s", strerror(errno));
1252+
php_error_docref(NULL, E_WARNING, "%s from %s to %s", strerror(errno), url_from, url_to);
12531253
#endif
12541254
return 0;
12551255
}

0 commit comments

Comments
 (0)