- Removed unused variables

Zend/zend_constants.c

@@ -37,8 +37,6 @@ void free_zend_constant(zend_constant *c) /* {{{ */
 
 void copy_zend_constant(zend_constant *c) /* {{{ */
 {
-	TSRMLS_FETCH();
-
 	c->name.u = zend_ustrndup(c->name.u, c->name_len - 1);
 
 	if (!(c->flags & CONST_PERSISTENT)) {

Zend/zend_hash.c

@@ -333,7 +333,6 @@ ZEND_API int _zend_ascii_hash_add_or_update(HashTable *ht, const char *arKey, ui
 {
 	zstr key;
 	int ret;
-	TSRMLS_FETCH();
 
 	key.u = zend_ascii_to_unicode(arKey, nKeyLength ZEND_FILE_LINE_CC);
 	ret = _zend_u_hash_add_or_update(ht, IS_UNICODE, key, nKeyLength, pData, nDataSize, pDest, flag ZEND_FILE_LINE_CC);
@@ -673,7 +672,6 @@ ZEND_API int zend_ascii_hash_del(HashTable *ht, const char *arKey, uint nKeyLeng
 {
 	zstr key;
 	int ret;
-	TSRMLS_FETCH();
 
 	key.u = zend_ascii_to_unicode(arKey, nKeyLength ZEND_FILE_LINE_CC);
 	ret = zend_u_hash_del_key_or_index(ht, IS_UNICODE, key, nKeyLength, 0, HASH_DEL_KEY);
@@ -1135,7 +1133,6 @@ ZEND_API int zend_ascii_hash_find(const HashTable *ht, const char *arKey, uint n
 {
 	zstr key;
 	int ret;
-	TSRMLS_FETCH();
 
 	key.u = zend_ascii_to_unicode(arKey, nKeyLength ZEND_FILE_LINE_CC);
 	ret = zend_u_hash_find(ht, IS_UNICODE, key, nKeyLength, pData);
@@ -1268,7 +1265,6 @@ ZEND_API int zend_ascii_hash_exists(HashTable *ht, const char *arKey, uint nKeyL
 {
 	zstr key;
 	int ret;
-	TSRMLS_FETCH();
 
 	key.u = zend_ascii_to_unicode(arKey, nKeyLength ZEND_FILE_LINE_CC);
 	ret = zend_u_hash_exists(ht, IS_UNICODE, key, nKeyLength);

Zend/zend_object_handlers.c

@@ -785,7 +785,6 @@ static inline zend_class_entry * zend_get_function_root_class(zend_function *fbc
 static inline union _zend_function *zend_get_user_call_function(zend_object *zobj, zstr method_name, int method_len) /* {{{ */
 {
 	zend_internal_function *call_user_call = emalloc(sizeof(zend_internal_function));
-	TSRMLS_FETCH();
 
 	call_user_call->type = ZEND_INTERNAL_FUNCTION;
 	call_user_call->module = zobj->ce->module;

Zend/zend_operators.c

@@ -2330,8 +2330,6 @@ static void increment_unicode(zval *str) /* {{{ */
     int ch;
 
 	if (Z_USTRLEN_P(str) == 0) {
-		TSRMLS_FETCH();
-
 		USTR_FREE(Z_USTRVAL_P(str));
 		ZVAL_ASCII_STRINGL(str, "1", sizeof("1")-1, 1);
 		return;

ext/date/php_date.c

@@ -2630,7 +2630,6 @@ static void zval_from_error_container(zval *z, timelib_error_container *error)
 {
 	int   i;
 	zval *element;
-	TSRMLS_FETCH();
 
 	add_ascii_assoc_long(z, "warning_count", error->warning_count);
 	MAKE_STD_ZVAL(element);

ext/libxml/libxml.c

@@ -850,7 +850,6 @@ int php_libxml_xmlCheckUTF8(const unsigned char *s)
 int php_libxml_register_export(zend_class_entry *ce, php_libxml_export_node export_function)
 {
 	php_libxml_func_handler export_hnd;
-	TSRMLS_FETCH();
 	
 	/* Initialize in case this module hasnt been loaded yet */
 	php_libxml_initialize();

ext/soap/soap.c

@@ -1373,7 +1373,7 @@ static HashTable* soap_create_typemap(sdlPtr sdl, HashTable *ht TSRMLS_DC)
 
 		if (Z_TYPE_PP(tmp) != IS_ARRAY) {
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Wrong 'typemap' option");
-			return;
+			return NULL;
 		}
 		ht2 = Z_ARRVAL_PP(tmp);
 

ext/standard/string.c

@@ -3643,7 +3643,6 @@ PHP_FUNCTION(chr)
 	UChar buf[2];
 	int buf_len;
 	long num;
-	char temp[2];
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &num) == FAILURE) {
 		return;

ext/standard/var_unserializer.c

@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Thu Mar 26 15:18:13 2009 */
+/* Generated by re2c 0.13.6.dev on Thu Mar 26 19:10:33 2009 */
 #line 1 "ext/standard/var_unserializer.re"
 /*
   +----------------------------------------------------------------------+
@@ -609,7 +609,7 @@ yy21:
 	++YYCURSOR;
 #line 693 "ext/standard/var_unserializer.re"
 	{
-	size_t len, len2, len3, maxlen;
+	size_t len, len2, maxlen;
 	long elements;
 	zstr class_name;
 	zend_class_entry *ce;

ext/standard/var_unserializer.re

@@ -691,7 +691,7 @@ use_double:
 }
 
 object ":" uiv ":" ["]	{
-	size_t len, len2, len3, maxlen;
+	size_t len, len2, maxlen;
 	long elements;
 	zstr class_name;
 	zend_class_entry *ce;