php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.5'

Browse Source
This commit is contained in:
Jakub Zelenka
2025-10-02 13:45:04 +02:00
parent c7b101b1d1 d44eb76c91
commit 37644106ef
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/network.c
View File

@@ -1074,7 +1074,7 @@ PHPAPI char *php_socket_strerror(long err, char *buf, size_t bufsize)
char *errstr = strerror_r(err, ebuf, sizeof(ebuf)); char *errstr = strerror_r(err, ebuf, sizeof(ebuf));
buf = estrdup(errstr); buf = estrdup(errstr);
# else # else
errno_t res = strerror_r(err, ebuf, sizeof(ebuf)); int res = (int) strerror_r(err, ebuf, sizeof(ebuf));
if (res == 0) { if (res == 0) {
buf = estrdup(ebuf); buf = estrdup(ebuf);
} else { } else {
@@ -1085,7 +1085,7 @@ PHPAPI char *php_socket_strerror(long err, char *buf, size_t bufsize)
# ifdef STRERROR_R_CHAR_P # ifdef STRERROR_R_CHAR_P
buf = strerror_r(err, buf, bufsize); buf = strerror_r(err, buf, bufsize);
# else # else
errno_t res = strerror_r(err, buf, bufsize); int res = (int) strerror_r(err, buf, bufsize);
if (res != 0) { if (res != 0) {
strncpy(buf, "Unknown error", bufsize); strncpy(buf, "Unknown error", bufsize);
buf[bufsize?(bufsize-1):0] = 0; buf[bufsize?(bufsize-1):0] = 0;
@@ -1130,7 +1130,7 @@ PHPAPI zend_string *php_socket_error_str(long err)
char *errstr = strerror_r(err, ebuf, sizeof(ebuf)); char *errstr = strerror_r(err, ebuf, sizeof(ebuf));
# else # else
const char *errstr; const char *errstr;
errno_t res = strerror_r(err, ebuf, sizeof(ebuf)); int res = (int) strerror_r(err, ebuf, sizeof(ebuf));
if (res == 0) { if (res == 0) {
errstr = ebuf; errstr = ebuf;
} else { } else {