com php-src: Remove more TSRMLS_CC macros: ext/openssl/ openssl.c
| From: | Joe Watkins | Date: | Wed, 18 Jan 2017 10:00:15 +0000 |
| Subject: | com php-src: Remove more TSRMLS_CC macros: ext/openssl/ openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96782@lists.php.net to get a copy of this message | ||
Commit: 9977bdf9b3bd235899c980edda12315ad6fa1338
Author: Thomas Punt <tpunt@hotmail.co.uk> Wed, 18 Jan 2017 09:57:27 +0000
Committer: Joe Watkins <krakjoe@php.net> Wed, 18 Jan 2017 10:00:15 +0000
Parents: 43612e9593c43c904b9403e00f8a254d8d76e338
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9977bdf9b3bd235899c980edda12315ad6fa1338
Log:
Remove more TSRMLS_CC macros
Changed paths:
M ext/openssl/openssl.c
Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index cb34077..9aec7f9 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -1180,7 +1180,7 @@ static int php_openssl_parse_config(struct php_x509_request * req, zval *
option
&& Z_TYPE_P(item) == IS_STRING) {
req->curve_name = OBJ_sn2nid(Z_STRVAL_P(item));
if (req->curve_name == NID_undef) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown elliptic curve (short) name %s",
Z_STRVAL_P(item));
+ php_error_docref(NULL, E_WARNING, "Unknown elliptic curve (short) name %s",
Z_STRVAL_P(item));
return FAILURE;
}
}
@@ -3917,7 +3917,7 @@ static EVP_PKEY * php_openssl_generate_private_key(struct php_x509_request *
req
case OPENSSL_KEYTYPE_EC:
{
if (req->curve_name == NID_undef) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Missing configuration value:
'curve_name' not set");
+ php_error_docref(NULL, E_WARNING, "Missing configuration value: 'curve_name'
not set");
return NULL;
}
EC_KEY *eckey = EC_KEY_new_by_curve_name(req->curve_name);