diff options
| author | Anatol Belski <ab@php.net> | 2014-12-14 14:22:42 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-14 14:22:42 +0100 |
| commit | 7b6ed8db2fa1574cffabde7a8bc9fdc277304528 (patch) | |
| tree | 1380358aab5eae4d514ed58d47e6344ad3bc3d92 | |
| parent | e112f6a04e0cddc6276c426c09c0249201878f5a (diff) | |
| download | php-git-7b6ed8db2fa1574cffabde7a8bc9fdc277304528.tar.gz | |
almost all the replacements of TSRMLS_* are done
Some places have to be yet touched as they use different/custom
macros namings for the same. Also some places in the code became
redundant now, this is the next task. To name some: ext/mysqlnd,
sapi/embed, ext/curl and some smaller places here and there.
| -rw-r--r-- | ext/calendar/calendar.c | 2 | ||||
| -rw-r--r-- | ext/com_dotnet/com_persist.c | 1 | ||||
| -rw-r--r-- | ext/com_dotnet/com_wrapper.c | 1 | ||||
| -rw-r--r-- | ext/intl/formatter/formatter_class.c | 4 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 4 | ||||
| -rw-r--r-- | ext/session/php_session.h | 2 |
6 files changed, 4 insertions, 10 deletions
diff --git a/ext/calendar/calendar.c b/ext/calendar/calendar.c index 3de1202772..0f94b08bca 100644 --- a/ext/calendar/calendar.c +++ b/ext/calendar/calendar.c @@ -392,7 +392,7 @@ PHP_FUNCTION(cal_from_jd) char date[16]; struct cal_entry_t *calendar; - if (zend_parse_parameters(ZEND_NUM_ARGS()TSRMLS_CC, "ll", &jd, &cal) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ll", &jd, &cal) == FAILURE) { RETURN_FALSE; } diff --git a/ext/com_dotnet/com_persist.c b/ext/com_dotnet/com_persist.c index eec1389ade..187b50b120 100644 --- a/ext/com_dotnet/com_persist.c +++ b/ext/com_dotnet/com_persist.c @@ -55,7 +55,6 @@ static void istream_dtor(zend_resource *rsrc) #define FETCH_STM() \ php_istream *stm = (php_istream*)This; \ - TSRMLS_FETCH(); \ if (GetCurrentThreadId() != stm->engine_thread) \ return RPC_E_WRONG_THREAD; diff --git a/ext/com_dotnet/com_wrapper.c b/ext/com_dotnet/com_wrapper.c index aa1c21c8f0..f1d08c15f2 100644 --- a/ext/com_dotnet/com_wrapper.c +++ b/ext/com_dotnet/com_wrapper.c @@ -88,7 +88,6 @@ static inline void trace(char *fmt, ...) #define FETCH_DISP(methname) \ php_dispatchex *disp = (php_dispatchex*)This; \ - TSRMLS_FETCH(); \ if (COMG(rshutdown_started)) { \ trace(" PHP Object:%p (name:unknown) %s\n", Z_OBJ(disp->object), methname); \ } else { \ diff --git a/ext/intl/formatter/formatter_class.c b/ext/intl/formatter/formatter_class.c index aa8844cca0..935c51a955 100644 --- a/ext/intl/formatter/formatter_class.c +++ b/ext/intl/formatter/formatter_class.c @@ -34,9 +34,7 @@ static zend_object_handlers NumberFormatter_handlers; */ /* {{{ NumberFormatter_objects_dtor */ -static void NumberFormatter_object_dtor( - zend_object *object - TSRMLS_DC ) +static void NumberFormatter_object_dtor(zend_object *object) { zend_objects_destroy_object( object ); } diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 881c1ae2fd..3da185ae29 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -440,9 +440,7 @@ mysqlnd_switch_to_ssl_if_needed( MYSQLND_CONN_DATA * conn, const MYSQLND_PACKET_GREET * const greet_packet, const MYSQLND_OPTIONS * const options, - zend_ulong mysql_flags - TSRMLS_DC - ) + zend_ulong mysql_flags) { enum_func_status ret = FAIL; const MYSQLND_CHARSET * charset; diff --git a/ext/session/php_session.h b/ext/session/php_session.h index 44c03e9ecc..f47938cab5 100644 --- a/ext/session/php_session.h +++ b/ext/session/php_session.h @@ -197,7 +197,7 @@ ZEND_TSRMLS_CACHE_EXTERN; #define PS(v) (ps_globals.v) #endif -#define PS_SERIALIZER_ENCODE_ARGS TSRMLS_D +#define PS_SERIALIZER_ENCODE_ARGS void #define PS_SERIALIZER_DECODE_ARGS const char *val, int vallen typedef struct ps_serializer_struct { |