com php-src: Remove leftovers of TSRMLS in code: ext/curl/interface.c ext/openssl/openssl.c ext/phar/phar_object.c ext/skeleton /create_stubs
ext/spl/spl_directory.c ext/zip/php_z ip.c

Commit: 618b96112434c794860947f705246be8af0c5d44 Author: Tom Van Looy <tom@ctors.net> Fri, 25 Dec 2015 11:13:39 +0100 Parents: 6d0dec27fa243f20a85c5f4a711c895ef8766dcf Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=618b96112434c794860947f705246be8af0c5d44 Log: Remove leftovers of TSRMLS in code Changed paths: M ext/curl/interface.c M ext/openssl/openssl.c M ext/phar/phar_object.c M ext/skeleton/create_stubs M ext/spl/spl_directory.c M ext/zip/php_zip.c Diff: diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 7dd04a6..5f71ba6 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -2187,7 +2187,7 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{ #endif # if defined(ZTS) if (option == CURLOPT_DNS_USE_GLOBAL_CACHE) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLOPT_DNS_USE_GLOBAL_CACHE cannot be activated when thread safety is enabled"); + php_error_docref(NULL, E_WARNING, "CURLOPT_DNS_USE_GLOBAL_CACHE cannot be activated when thread safety is enabled"); return 1; } # endif diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index b2ae5fc..4af8c60 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -4927,7 +4927,7 @@ PHP_FUNCTION(openssl_seal) iv_len = EVP_CIPHER_iv_length(cipher); if (!iv && iv_len > 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL, E_WARNING, "Cipher algorithm requires an IV to be supplied as a sixth parameter"); RETURN_FALSE; } diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 3c6925e..3fe72e1 100644 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -4085,7 +4085,7 @@ static int phar_extract_file(zend_bool overwrite, phar_entry_info *entry, char * new_state.cwd[0] = DEFAULT_SLASH; new_state.cwd[1] = '\0'; new_state.cwd_length = 1; - if (virtual_file_ex(&new_state, entry->filename, NULL, CWD_EXPAND TSRMLS_CC) != 0 || + if (virtual_file_ex(&new_state, entry->filename, NULL, CWD_EXPAND) != 0 || new_state.cwd_length <= 1) { if (EINVAL == errno && entry->filename_len > 50) { char *tmp = estrndup(entry->filename, 50); diff --git a/ext/skeleton/create_stubs b/ext/skeleton/create_stubs index 1163908..a3f3d19 100755 --- a/ext/skeleton/create_stubs +++ b/ext/skeleton/create_stubs @@ -195,7 +195,7 @@ END { if (maxargs[i]>0) { fetchargs = "\tif (zend_parse_parameters(" ints = ints "\tint argc = ZEND_NUM_ARGS();\n" - fetchargs = fetchargs "argc TSRMLS_CC, " specs[i] + fetchargs = fetchargs "argc, " specs[i] } else { fetchargs = fetchargs "\tif (zend_parse_parameters_none() == FAILURE) {\n\t\treturn;\n\t}" xmlparams = xmlparams " <void/>\n" diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index c9f6277..7440c58 100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -834,7 +834,7 @@ SPL_METHOD(DirectoryIterator, seek) zval_ptr_dtor(&retval); } if (!valid) { - zend_throw_exception_ex(spl_ce_OutOfBoundsException, 0 TSRMLS_CC, "Seek position %ld is out of range", pos); + zend_throw_exception_ex(spl_ce_OutOfBoundsException, 0, "Seek position %ld is out of range", pos); return; } zend_call_method_with_0_params(&EX(This), Z_OBJCE(EX(This)), &intern->u.dir.func_next, "next", NULL); diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip..c index 0e0d5db..92759f5 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -1506,7 +1506,7 @@ static ZIPARCHIVE_METHOD(close) ze_obj = Z_ZIP_P(self); if ((err = zip_close(intern))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", zip_strerror(intern)); + php_error_docref(NULL, E_WARNING, "%s", zip_strerror(intern)); zip_discard(intern); }