mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-28 20:34:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

almost all the replacements of TSRMLS_* are done

Browse Source 
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.
This commit is contained in:
Anatol Belski 2014-12-14 14:22:42 +01:00
parent e112f6a04e
commit 7b6ed8db2f
6 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/calendar/calendar.c
View File

@ -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;
}

1
ext/com_dotnet/com_persist.c
View File

@ -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;

1
ext/com_dotnet/com_wrapper.c
View File

@ -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 { \

4
ext/intl/formatter/formatter_class.c
View File

@ -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 );
}

4
ext/mysqlnd/mysqlnd.c
View File

@ -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;

2
ext/session/php_session.h
View File

@ -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 {