diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-11-12 16:43:57 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-11-12 16:43:57 +0100 |
| commit | 1e0610fe243fcfafd23ff821129cf4f35148ac64 (patch) | |
| tree | 2089958de552235be618c4e732b5edbe8faf2e87 /main | |
| parent | be2985335305f921599cfdd25b7830ded1ca395e (diff) | |
| parent | a08a2b48b489572db89940027206020ee714afa5 (diff) | |
| download | php-git-1e0610fe243fcfafd23ff821129cf4f35148ac64.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
Strip trailing line breaks and periods from Windows error messages
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/main/main.c b/main/main.c index 8a860505f9..26ea0c549e 100644 --- a/main/main.c +++ b/main/main.c @@ -1110,13 +1110,6 @@ PHPAPI ZEND_COLD void php_error_docref2(const char *docref, const char *param1, #ifdef PHP_WIN32 PHPAPI ZEND_COLD void php_win32_docref2_from_error(DWORD error, const char *param1, const char *param2) { char *buf = php_win32_error_to_msg(error); - size_t buf_len; - - buf_len = strlen(buf); - if (buf_len >= 2) { - buf[buf_len - 1] = '\0'; - buf[buf_len - 2] = '\0'; - } php_error_docref2(NULL, param1, param2, E_WARNING, "%s (code: %lu)", buf, error); php_win32_error_msg_free(buf); } |