diff options
Diffstat (limited to 'ext/standard/var_unserializer.re')
| -rw-r--r-- | ext/standard/var_unserializer.re | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index c7871671b6..99600995a5 100644 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@ -333,7 +333,7 @@ static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, zend ZVAL_UNDEF(&key); - if (!php_var_unserialize_ex(&key, p, max, NULL, classes TSRMLS_CC)) { + if (!php_var_unserialize_ex(&key, p, max, NULL, classes)) { zval_dtor(&key); return 0; } @@ -385,7 +385,7 @@ static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, zend zval_dtor(&key); - if (!php_var_unserialize_ex(data, p, max, var_hash, classes TSRMLS_CC)) { + if (!php_var_unserialize_ex(data, p, max, var_hash, classes)) { return 0; } @@ -425,7 +425,7 @@ static inline int object_custom(UNSERIALIZE_PARAMETER, zend_class_entry *ce) if (ce->unserialize == NULL) { zend_error(E_WARNING, "Class %s has no unserializer", ce->name->val); object_init_ex(rval, ce); - } else if (ce->unserialize(rval, ce, (const unsigned char*)*p, datalen, (zend_unserialize_data *)var_hash TSRMLS_CC) != SUCCESS) { + } else if (ce->unserialize(rval, ce, (const unsigned char*)*p, datalen, (zend_unserialize_data *)var_hash) != SUCCESS) { return 0; } @@ -476,7 +476,7 @@ static inline int object_common2(UNSERIALIZE_PARAMETER, zend_long elements) zend_hash_str_exists(&Z_OBJCE_P(rval)->function_table, "__wakeup", sizeof("__wakeup")-1)) { ZVAL_STRINGL(&fname, "__wakeup", sizeof("__wakeup") - 1); BG(serialize_lock)++; - call_user_function_ex(CG(function_table), rval, &fname, &retval, 0, 0, 1, NULL TSRMLS_CC); + call_user_function_ex(CG(function_table), rval, &fname, &retval, 0, 0, 1, NULL); BG(serialize_lock)--; zval_dtor(&fname); zval_dtor(&retval); @@ -493,7 +493,7 @@ static inline int object_common2(UNSERIALIZE_PARAMETER, zend_long elements) # pragma optimize("", on) #endif -PHPAPI int php_var_unserialize(zval *rval, const unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash TSRMLS_DC) +PHPAPI int php_var_unserialize(zval *rval, const unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash) { HashTable *classes = NULL; return php_var_unserialize_ex(UNSERIALIZE_PASSTHRU); @@ -769,7 +769,7 @@ object ":" uiv ":" ["] { /* Try to find class directly */ BG(serialize_lock)++; - ce = zend_lookup_class(class_name TSRMLS_CC); + ce = zend_lookup_class(class_name); if (ce) { BG(serialize_lock)--; if (EG(exception)) { @@ -797,7 +797,7 @@ object ":" uiv ":" ["] { ZVAL_STR_COPY(&args[0], class_name); BG(serialize_lock)++; - if (call_user_function_ex(CG(function_table), NULL, &user_func, &retval, 1, args, 0, NULL TSRMLS_CC) != SUCCESS) { + if (call_user_function_ex(CG(function_table), NULL, &user_func, &retval, 1, args, 0, NULL) != SUCCESS) { BG(serialize_lock)--; if (EG(exception)) { zend_string_release(class_name); @@ -805,7 +805,7 @@ object ":" uiv ":" ["] { zval_ptr_dtor(&args[0]); return 0; } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "defined (%s) but not found", Z_STRVAL(user_func)); + php_error_docref(NULL, E_WARNING, "defined (%s) but not found", Z_STRVAL(user_func)); incomplete_class = 1; ce = PHP_IC_ENTRY; zval_ptr_dtor(&user_func); @@ -822,8 +822,8 @@ object ":" uiv ":" ["] { } /* The callback function may have defined the class */ - if ((ce = zend_lookup_class(class_name TSRMLS_CC)) == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Function %s() hasn't defined the class it was called for", Z_STRVAL(user_func)); + if ((ce = zend_lookup_class(class_name)) == NULL) { + php_error_docref(NULL, E_WARNING, "Function %s() hasn't defined the class it was called for", Z_STRVAL(user_func)); incomplete_class = 1; ce = PHP_IC_ENTRY; } @@ -859,7 +859,7 @@ object ":" uiv ":" ["] { "}" { /* this is the case where we have less data than planned */ - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unexpected end of serialized data"); + php_error_docref(NULL, E_NOTICE, "Unexpected end of serialized data"); return 0; /* not sure if it should be 0 or 1 here? */ } |