From: Sebastian Bergmann <sebastian@php.net>
Date: Sun, 5 Aug 2001 05:35:06 +0000 (+0000)
Subject: Remove more duplicate TSRMLS_FETCH() calls.
X-Git-Tag: PRE_ENGINE2_SPLIT~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a70ecedb33580601e1934979de77e38a44f53ff9;p=php

Remove more duplicate TSRMLS_FETCH() calls.
---

diff --git a/sapi/caudium/caudium.c b/sapi/caudium/caudium.c
index 135c242896..bab0e35734 100644
--- a/sapi/caudium/caudium.c
+++ b/sapi/caudium/caudium.c
@@ -612,8 +612,6 @@ static void php_caudium_module_main(php_caudium_request *ureq)
   struct thread_state *state;
   extern struct program *thread_id_prog;
 #endif
-  TSRMLS_FETCH();
-  TSRMLS_FETCH();
   TSRMLS_FETCH();
   GET_THIS();
   THIS->filename = ureq->filename;
diff --git a/sapi/fastcgi/fastcgi.c b/sapi/fastcgi/fastcgi.c
index 382d148807..fa939a8aed 100644
--- a/sapi/fastcgi/fastcgi.c
+++ b/sapi/fastcgi/fastcgi.c
@@ -196,7 +196,6 @@ static void fastcgi_module_main(TSRMLS_D TSRMLS_DC)
 {
 	zend_file_handle file_handle;
 	TSRMLS_FETCH();
-	TSRMLS_FETCH();
 
 	file_handle.type = ZEND_HANDLE_FILENAME;
 	file_handle.filename = SG(request_info).path_translated;
diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index 0ed677a96d..e7633f07b6 100644
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -448,7 +448,6 @@ nsapi_module_main(NSLS_D SLS_DC)
 	int result;
 	zend_file_handle file_handle;
 	TSRMLS_FETCH();
-	TSRMLS_FETCH();
 
 	if (php_request_startup(TSRMLS_C) == FAILURE) {
 		return FAILURE;
diff --git a/sapi/phttpd/phttpd.c b/sapi/phttpd/phttpd.c
index cb3b524723..c3aec39e93 100644
--- a/sapi/phttpd/phttpd.c
+++ b/sapi/phttpd/phttpd.c
@@ -255,7 +255,6 @@ int php_doit(TSRMLS_D TSRMLS_DC)
 	zend_file_handle file_handle;
 	struct httpinfo *hip = PHG(cip)->hip;
 	TSRMLS_FETCH();
-	TSRMLS_FETCH();
 
 	if (php_request_startup(TSRMLS_C) == FAILURE) {
         return -1;
diff --git a/sapi/pi3web/pi3web_sapi.c b/sapi/pi3web/pi3web_sapi.c
index 3a52e14cd2..99f48d2be1 100644
--- a/sapi/pi3web/pi3web_sapi.c
+++ b/sapi/pi3web/pi3web_sapi.c
@@ -378,8 +378,6 @@ DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB)
 	char *header_line;
 	int iRet = PIAPI_COMPLETED;
 	TSRMLS_FETCH();
-	TSRMLS_FETCH();
-	TSRMLS_FETCH();
 
 	zend_try {
 		file_handle.filename = lpCB->lpszFileName;
diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c
index 09ea71c4d3..c670d6b6bb 100644
--- a/sapi/roxen/roxen.c
+++ b/sapi/roxen/roxen.c
@@ -585,7 +585,6 @@ static int php_roxen_module_main(TSRMLS_D)
   zend_file_handle file_handle;
 #ifdef ZTS
   TSRMLS_FETCH();
-  TSRMLS_FETCH();
 #ifdef ROXEN_USE_ZTS
   GET_THIS();
 #endif
diff --git a/sapi/thttpd/thttpd.c b/sapi/thttpd/thttpd.c
index f12e50a79a..5da9d6eeef 100644
--- a/sapi/thttpd/thttpd.c
+++ b/sapi/thttpd/thttpd.c
@@ -262,7 +262,6 @@ static void thttpd_module_main(TSRMLS_D TSRMLS_DC)
 {
 	zend_file_handle file_handle;
 	TSRMLS_FETCH();
-	TSRMLS_FETCH();
 
 	file_handle.type = ZEND_HANDLE_FILENAME;
 	file_handle.filename = SG(request_info).path_translated;
@@ -446,7 +445,6 @@ static void *worker_thread(void *dummy)
 	int do_work = 50;
 	httpd_conn *hc;
 	TSRMLS_FETCH();
-	TSRMLS_FETCH();
 
 	while (do_work) {
 		hc = dequeue_request();
@@ -518,7 +516,6 @@ off_t thttpd_php_request(httpd_conn *hc)
 #ifdef ZTS
 	queue_request(hc);
 #else
-	TSRMLS_FETCH();
 	TSRMLS_FETCH();
 	return thttpd_real_php_request(hc TSRMLS_CC TSRMLS_CC);
 #endif