Fix ZTS usage.

Andrei Zmievski · Andrei Zmievski · commit 67d2b5bd8aeb · 2009-02-19T14:44:18.000-08:00
diff --git a/php_memcached.c b/php_memcached.c
@@ -346,7 +346,7 @@ static void php_memc_get_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)
 
 		status = memcached_mget_by_key(i_obj->memc, server_key, server_key_len, &key, &key_len, 1);
 
-		if (php_memc_handle_error(status) < 0) {
+		if (php_memc_handle_error(status TSRMLS_CC) < 0) {
 			RETURN_FALSE;
 		}
 
@@ -366,11 +366,11 @@ static void php_memc_get_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)
 			 */
 			if (status == MEMCACHED_NOTFOUND && fci.size != 0) {
 				status = php_memc_do_cache_callback(getThis(), &fci, &fcc, key, key_len,
-													return_value TSRMLS_DC);
+													return_value TSRMLS_CC);
 				ZVAL_DOUBLE(cas_token, 0);
 			}
 
-			if (php_memc_handle_error(status) < 0) {
+			if (php_memc_handle_error(status TSRMLS_CC) < 0) {
 				memcached_result_free(&result);
 				RETURN_FALSE;
 			}
@@ -424,7 +424,7 @@ static void php_memc_get_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)
 		 */
 		if (payload == NULL && status == MEMCACHED_NOTFOUND && fci.size != 0) {
 			status = php_memc_do_cache_callback(getThis(), &fci, &fcc, key, key_len,
-												return_value TSRMLS_DC);
+												return_value TSRMLS_CC);
 		}
 
 		(void)memcached_fetch(i_obj->memc, NULL, NULL, &dummy_length, &dummy_flags, &dummy_status);
@@ -553,7 +553,7 @@ static void php_memc_getMulti_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_ke
 
 	efree(mkeys);
 	efree(mkeys_len);
-	if (php_memc_handle_error(status) < 0) {
+	if (php_memc_handle_error(status TSRMLS_CC) < 0) {
 		RETURN_FALSE;
 	}
 
@@ -594,7 +594,7 @@ static void php_memc_getMulti_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_ke
 
 	memcached_result_free(&result);
 
-	if (status != MEMCACHED_END && php_memc_handle_error(status) < 0) {
+	if (status != MEMCACHED_END && php_memc_handle_error(status TSRMLS_CC) < 0) {
 		zval_dtor(return_value);
 		RETURN_FALSE;
 	}
@@ -702,7 +702,7 @@ static void php_memc_getDelayed_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_
 
 	efree(mkeys);
 	efree(mkeys_len);
-	if (php_memc_handle_error(status) < 0) {
+	if (php_memc_handle_error(status TSRMLS_CC) < 0) {
 		RETURN_FALSE;
 	}
 
@@ -726,7 +726,7 @@ static void php_memc_getDelayed_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_
 		if (status == MEMCACHED_END) {
 			status = MEMCACHED_SUCCESS;
 		}
-		if (php_memc_handle_error(status) < 0) {
+		if (php_memc_handle_error(status TSRMLS_CC) < 0) {
 			RETURN_FALSE;
 		}
 	}
@@ -841,7 +841,7 @@ PHP_METHOD(Memcached, fetchAll)
 
 	memcached_result_free(&result);
 
-	if (status != MEMCACHED_END && php_memc_handle_error(status) < 0) {
+	if (status != MEMCACHED_END && php_memc_handle_error(status TSRMLS_CC) < 0) {
 		zval_dtor(return_value);
 		RETURN_FALSE;
 	}
diff --git a/php_memcached.h b/php_memcached.h
@@ -53,7 +53,7 @@ PHP_MINFO_FUNCTION(memcached);
 #define PHP_MEMCACHED_VERSION "0.1.4"
 
 #ifdef ZTS
-#define MEMC_G(v) TSRMG(php_memcached_globals_id, zend_memcache_globals *, v)
+#define MEMC_G(v) TSRMG(php_memcached_globals_id, zend_php_memcache_globals *, v)
 #else
 #define MEMC_G(v) (php_memcached_globals.v)
 #endif

Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,7 @@ static void php_memc_get_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)`
`346`	`346`
`347`	`347`	`status = memcached_mget_by_key(i_obj->memc, server_key, server_key_len, &key, &key_len, 1);`
`348`	`348`
`349`		`- if (php_memc_handle_error(status) < 0) {`
	`349`	`+ if (php_memc_handle_error(status TSRMLS_CC) < 0) {`
`350`	`350`	`RETURN_FALSE;`
`351`	`351`	`}`
`352`	`352`
`@@ -366,11 +366,11 @@ static void php_memc_get_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)`
`366`	`366`	`*/`
`367`	`367`	`if (status == MEMCACHED_NOTFOUND && fci.size != 0) {`
`368`	`368`	`status = php_memc_do_cache_callback(getThis(), &fci, &fcc, key, key_len,`
`369`		`- return_value TSRMLS_DC);`
	`369`	`+ return_value TSRMLS_CC);`
`370`	`370`	`ZVAL_DOUBLE(cas_token, 0);`
`371`	`371`	`}`
`372`	`372`
`373`		`- if (php_memc_handle_error(status) < 0) {`
	`373`	`+ if (php_memc_handle_error(status TSRMLS_CC) < 0) {`
`374`	`374`	`memcached_result_free(&result);`
`375`	`375`	`RETURN_FALSE;`
`376`	`376`	`}`
`@@ -424,7 +424,7 @@ static void php_memc_get_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)`
`424`	`424`	`*/`
`425`	`425`	`if (payload == NULL && status == MEMCACHED_NOTFOUND && fci.size != 0) {`
`426`	`426`	`status = php_memc_do_cache_callback(getThis(), &fci, &fcc, key, key_len,`
`427`		`- return_value TSRMLS_DC);`
	`427`	`+ return_value TSRMLS_CC);`
`428`	`428`	`}`
`429`	`429`
`430`	`430`	`(void)memcached_fetch(i_obj->memc, NULL, NULL, &dummy_length, &dummy_flags, &dummy_status);`
`@@ -553,7 +553,7 @@ static void php_memc_getMulti_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_ke`
`553`	`553`
`554`	`554`	`efree(mkeys);`
`555`	`555`	`efree(mkeys_len);`
`556`		`- if (php_memc_handle_error(status) < 0) {`
	`556`	`+ if (php_memc_handle_error(status TSRMLS_CC) < 0) {`
`557`	`557`	`RETURN_FALSE;`
`558`	`558`	`}`
`559`	`559`
`@@ -594,7 +594,7 @@ static void php_memc_getMulti_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_ke`
`594`	`594`
`595`	`595`	`memcached_result_free(&result);`
`596`	`596`
`597`		`- if (status != MEMCACHED_END && php_memc_handle_error(status) < 0) {`
	`597`	`+ if (status != MEMCACHED_END && php_memc_handle_error(status TSRMLS_CC) < 0) {`
`598`	`598`	`zval_dtor(return_value);`
`599`	`599`	`RETURN_FALSE;`
`600`	`600`	`}`
`@@ -702,7 +702,7 @@ static void php_memc_getDelayed_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_`
`702`	`702`
`703`	`703`	`efree(mkeys);`
`704`	`704`	`efree(mkeys_len);`
`705`		`- if (php_memc_handle_error(status) < 0) {`
	`705`	`+ if (php_memc_handle_error(status TSRMLS_CC) < 0) {`
`706`	`706`	`RETURN_FALSE;`
`707`	`707`	`}`
`708`	`708`
`@@ -726,7 +726,7 @@ static void php_memc_getDelayed_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_`
`726`	`726`	`if (status == MEMCACHED_END) {`
`727`	`727`	`status = MEMCACHED_SUCCESS;`
`728`	`728`	`}`
`729`		`- if (php_memc_handle_error(status) < 0) {`
	`729`	`+ if (php_memc_handle_error(status TSRMLS_CC) < 0) {`
`730`	`730`	`RETURN_FALSE;`
`731`	`731`	`}`
`732`	`732`	`}`
`@@ -841,7 +841,7 @@ PHP_METHOD(Memcached, fetchAll)`
`841`	`841`
`842`	`842`	`memcached_result_free(&result);`
`843`	`843`
`844`		`- if (status != MEMCACHED_END && php_memc_handle_error(status) < 0) {`
	`844`	`+ if (status != MEMCACHED_END && php_memc_handle_error(status TSRMLS_CC) < 0) {`
`845`	`845`	`zval_dtor(return_value);`
`846`	`846`	`RETURN_FALSE;`
`847`	`847`	`}`