summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ext/dom/document.c4
-rw-r--r--ext/fileinfo/fileinfo.c2
-rw-r--r--ext/hash/hash.c4
-rw-r--r--ext/mysqlnd/mysqlnd.c2
-rw-r--r--ext/openssl/xp_ssl.c2
-rw-r--r--ext/pgsql/pgsql.c2
-rw-r--r--ext/standard/mail.c2
-rw-r--r--ext/standard/pack.c2
-rw-r--r--ext/zip/php_zip.c6
-rw-r--r--ext/zip/zip_stream.c2
10 files changed, 14 insertions, 14 deletions
diff --git a/ext/dom/document.c b/ext/dom/document.c
index 001b477354..2fde4dc39a 100644
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -1811,7 +1811,7 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type
php_error_docref(NULL, E_WARNING, "Invalid Schema file source");
RETURN_FALSE;
}
- valid_file = _dom_get_valid_file_path(source, resolved_path, MAXPATHLEN TSRMLS_CC);
+ valid_file = _dom_get_valid_file_path(source, resolved_path, MAXPATHLEN );
if (!valid_file) {
php_error_docref(NULL, E_WARNING, "Invalid Schema file source");
RETURN_FALSE;
@@ -1911,7 +1911,7 @@ static void _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int typ
php_error_docref(NULL, E_WARNING, "Invalid RelaxNG file source");
RETURN_FALSE;
}
- valid_file = _dom_get_valid_file_path(source, resolved_path, MAXPATHLEN TSRMLS_CC);
+ valid_file = _dom_get_valid_file_path(source, resolved_path, MAXPATHLEN );
if (!valid_file) {
php_error_docref(NULL, E_WARNING, "Invalid RelaxNG file source");
RETURN_FALSE;
diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c
index 8663372de3..3474a0a0aa 100644
--- a/ext/fileinfo/fileinfo.c
+++ b/ext/fileinfo/fileinfo.c
@@ -528,7 +528,7 @@ static void _php_finfo_get_type(INTERNAL_FUNCTION_PARAMETERS, int mode, int mime
goto clean;
}
if (CHECK_NULL_PATH(buffer, buffer_len)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid path");
+ php_error_docref(NULL, E_WARNING, "Invalid path");
RETVAL_FALSE;
goto clean;
}
diff --git a/ext/hash/hash.c b/ext/hash/hash.c
index 325c9b9230..abbe90c750 100644
--- a/ext/hash/hash.c
+++ b/ext/hash/hash.c
@@ -137,7 +137,7 @@ static void php_hash_do_hash(INTERNAL_FUNCTION_PARAMETERS, int isfilename, zend_
}
if (isfilename) {
if (CHECK_NULL_PATH(data, data_len)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid path");
+ php_error_docref(NULL, E_WARNING, "Invalid path");
RETURN_FALSE;
}
stream = php_stream_open_wrapper_ex(data, "rb", REPORT_ERRORS, NULL, DEFAULT_CONTEXT);
@@ -256,7 +256,7 @@ static void php_hash_do_hash_hmac(INTERNAL_FUNCTION_PARAMETERS, int isfilename,
}
if (isfilename) {
if (CHECK_NULL_PATH(data, data_len)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid path");
+ php_error_docref(NULL, E_WARNING, "Invalid path");
RETURN_FALSE;
}
stream = php_stream_open_wrapper_ex(data, "rb", REPORT_ERRORS, NULL, DEFAULT_CONTEXT);
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 7595474475..d60a83c67d 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -518,7 +518,7 @@ end:
close_conn:
CONN_SET_STATE(conn, CONN_QUIT_SENT);
- conn->m->send_close(conn TSRMLS_CC);
+ conn->m->send_close(conn);
SET_CLIENT_ERROR(*conn->error_info, CR_SERVER_GONE_ERROR, UNKNOWN_SQLSTATE, mysqlnd_server_gone);
PACKET_FREE(auth_packet);
DBG_RETURN(ret);
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 41d6a0a8d1..d05a925d07 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -1946,7 +1946,7 @@ static size_t php_openssl_sockop_io(int read, php_stream *stream, char *buf, siz
timeout = &sslsock->s.timeout;
}
- if (timeout && php_set_sock_blocking(sslsock->s.socket, 0 TSRMLS_CC) == SUCCESS) {
+ if (timeout && php_set_sock_blocking(sslsock->s.socket, 0) == SUCCESS) {
sslsock->s.is_blocked = 0;
}
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 888ae76cce..89615080d8 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -5506,7 +5506,7 @@ PHP_PGSQL_API int php_pgsql_meta_data(PGconn *pg_link, const char *table_name, z
tmp_name = php_strtok_r(src, ".", &tmp_name2);
if (!tmp_name) {
efree(src);
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "The table name must be specified");
+ php_error_docref(NULL, E_WARNING, "The table name must be specified");
return FAILURE;
}
if (!tmp_name2 || !*tmp_name2) {
diff --git a/ext/standard/mail.c b/ext/standard/mail.c
index 6e83b95fc3..dcc1e1153b 100644
--- a/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@ -331,7 +331,7 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char
}
if (hdr && php_mail_detect_multiple_crlf(hdr)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Multiple or malformed newlines found in additional_header");
+ php_error_docref(NULL, E_WARNING, "Multiple or malformed newlines found in additional_header");
MAIL_RET(0);
}
diff --git a/ext/standard/pack.c b/ext/standard/pack.c
index 4d4b8b31e7..f46f8967e9 100644
--- a/ext/standard/pack.c
+++ b/ext/standard/pack.c
@@ -700,7 +700,7 @@ PHP_FUNCTION(unpack)
}
if (size != 0 && size != -1 && size < 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Type %c: integer overflow", type);
+ php_error_docref(NULL, E_WARNING, "Type %c: integer overflow", type);
zval_dtor(return_value);
RETURN_FALSE;
}
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index 85bc51f152..672097dec5 100644
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -2292,13 +2292,13 @@ static ZIPARCHIVE_METHOD(setCompressionName)
ZIP_FROM_OBJECT(intern, this);
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl|l",
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "sl|l",
&name, &name_len, &comp_method, &comp_flags) == FAILURE) {
return;
}
if (name_len < 1) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Empty string as entry name");
+ php_error_docref(NULL, E_NOTICE, "Empty string as entry name");
}
idx = zip_name_locate(intern, name, 0);
@@ -2329,7 +2329,7 @@ static ZIPARCHIVE_METHOD(setCompressionIndex)
ZIP_FROM_OBJECT(intern, this);
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll|l",
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "ll|l",
&index, &comp_method, &comp_flags) == FAILURE) {
return;
}
diff --git a/ext/zip/zip_stream.c b/ext/zip/zip_stream.c
index 3ae3e34f13..e42c6a38c1 100644
--- a/ext/zip/zip_stream.c
+++ b/ext/zip/zip_stream.c
@@ -61,7 +61,7 @@ static size_t php_zip_ops_read(php_stream *stream, char *buf, size_t count)
zip_error_t *err;
err = zip_file_get_error(self->zf);
stream->eof = 1;
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Zip stream error: %s", zip_error_strerror(err));
+ php_error_docref(NULL, E_WARNING, "Zip stream error: %s", zip_error_strerror(err));
zip_error_fini(err);
#endif
return 0;
View Lorry Controller Status