[prev in list] [next in list] [prev in thread] [next in thread]
List: php-cvs
Subject: [PHP-CVS] cvs: php4 /ext/crack crack.c /ext/domxml php_domxml.c /ext/dotnet dotnet.cpp /ext/fdf f
From: "Zeev Suraski" <zeev () zend ! com>
Date: 2001-07-31 4:53:54
[Download RAW message or body]
zeev Tue Jul 31 00:53:54 2001 EDT
Modified files:
/php4/ext/crack crack.c
/php4/ext/domxml php_domxml.c
/php4/ext/dotnet dotnet.cpp
/php4/ext/fdf fdf.c
/php4/ext/mbstring mbstring.c
/php4/ext/mssql php_mssql.c
/php4/ext/oci8 oci8.c
/php4/ext/odbc php_odbc.c
/php4/ext/pgsql pgsql.c
/php4/ext/standard basic_functions.c info.c
/php4/ext/sybase php_sybase_db.c
/php4/ext/sybase_ct php_sybase_ct.c
/php4/main SAPI.c SAPI.h main.c php_ini.c php_ini.h php_ticks.c
rfc1867.c
/php4/sapi/apache mod_php4.c
/php4/sapi/cgi cgi_main.c
/php4/sapi/fastcgi fastcgi.c
/php4/sapi/isapi php4isapi.c
/php4/sapi/pi3web pi3web_sapi.c
/php4/sapi/servlet servlet.c
Log:
More TSRMLS_FETCH work
["zeev-20010731005354.txt" (text/plain)]
Index: php4/ext/crack/crack.c
diff -u php4/ext/crack/crack.c:1.8 php4/ext/crack/crack.c:1.9
--- php4/ext/crack/crack.c:1.8 Mon Jul 30 04:24:23 2001
+++ php4/ext/crack/crack.c Tue Jul 31 00:53:46 2001
@@ -15,7 +15,7 @@
| Authors: |
+----------------------------------------------------------------------+
*/
-/* $Id: crack.c,v 1.8 2001/07/30 08:24:23 zeev Exp $ */
+/* $Id: crack.c,v 1.9 2001/07/31 04:53:46 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -65,7 +65,6 @@
{
PWDICT *pwdict;
long resource;
- TSRMLS_FETCH();
if (CRACKG(current_id) != -1) {
zend_error(E_WARNING, "Can not use more than one open dictionary with this \
implementation of libcrack");
Index: php4/ext/domxml/php_domxml.c
diff -u php4/ext/domxml/php_domxml.c:1.43 php4/ext/domxml/php_domxml.c:1.44
--- php4/ext/domxml/php_domxml.c:1.43 Mon Jul 30 16:11:28 2001
+++ php4/ext/domxml/php_domxml.c Tue Jul 31 00:53:46 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_domxml.c,v 1.43 2001/07/30 20:11:28 sniper Exp $ */
+/* $Id: php_domxml.c,v 1.44 2001/07/31 04:53:46 zeev Exp $ */
#ifdef HAVE_CONFIG_H
@@ -466,12 +466,11 @@
return(wrapper);
}
-void *php_xpath_get_context(zval *wrapper, int rsrc_type1, int rsrc_type2)
+void *php_xpath_get_context(zval *wrapper, int rsrc_type1, int rsrc_type2 TSRMLS_DC)
{
void *obj;
zval **handle;
int type;
- TSRMLS_FETCH();
if (Z_TYPE_P(wrapper) != IS_OBJECT) {
php_error(E_ERROR, "Wrapper is not an object");
@@ -546,12 +545,11 @@
return(wrapper);
}
-void *php_dom_get_object(zval *wrapper, int rsrc_type1, int rsrc_type2)
+void *php_dom_get_object(zval *wrapper, int rsrc_type1, int rsrc_type2 TSRMLS_DC)
{
void *obj;
zval **handle;
int type;
- TSRMLS_FETCH();
if (Z_TYPE_P(wrapper) != IS_OBJECT) {
php_error(E_ERROR, "Wrapper is not an object");
@@ -878,7 +876,7 @@
xmlAttrPtr attrp;
id = getThis();
- attrp = php_dom_get_object(id, le_domxmlattrp, 0);
+ attrp = php_dom_get_object(id, le_domxmlattrp, 0 TSRMLS_CC);
RETURN_STRING((char *) (attrp->name), 1);
}
@@ -892,7 +890,7 @@
xmlAttrPtr attrp;
id = getThis();
- attrp = php_dom_get_object(id, le_domxmlattrp, 0);
+ attrp = php_dom_get_object(id, le_domxmlattrp, 0 TSRMLS_CC);
RETURN_STRING((char *) xmlNodeGetContent((xmlNodePtr) attrp), 1);
}
@@ -906,7 +904,7 @@
xmlAttrPtr attrp;
id = getThis();
- attrp = php_dom_get_object(id, le_domxmlattrp, 0);
+ attrp = php_dom_get_object(id, le_domxmlattrp, 0 TSRMLS_CC);
RETURN_TRUE;
}
@@ -923,7 +921,7 @@
xmlNodePtr nodep;
id = getThis();
- nodep = php_dom_get_object(id, le_domxmlpip, 0);
+ nodep = php_dom_get_object(id, le_domxmlpip, 0 TSRMLS_CC);
RETURN_STRING((char *)nodep->name, 1);
}
@@ -937,7 +935,7 @@
xmlNodePtr nodep;
id = getThis();
- nodep = php_dom_get_object(id, le_domxmlpip, 0);
+ nodep = php_dom_get_object(id, le_domxmlpip, 0 TSRMLS_CC);
RETURN_STRING(xmlNodeGetContent(nodep), 1);
}
@@ -954,7 +952,7 @@
xmlNodePtr nodep;
id = getThis();
- nodep = php_dom_get_object(id, le_domxmlcdatap, 0);
+ nodep = php_dom_get_object(id, le_domxmlcdatap, 0 TSRMLS_CC);
RETURN_LONG(1);
}
@@ -999,7 +997,7 @@
const char *str = NULL;
id = getThis();
- n = php_dom_get_object(id, le_domxmlnodep, 0);
+ n = php_dom_get_object(id, le_domxmlnodep, 0 TSRMLS_CC);
switch (n->type)
{
@@ -1044,7 +1042,7 @@
char *str = NULL;
id = getThis();
- n = php_dom_get_object(id, le_domxmlnodep, 0);
+ n = php_dom_get_object(id, le_domxmlnodep, 0 TSRMLS_CC);
if (!n) {
RETURN_FALSE;
@@ -1071,7 +1069,7 @@
xmlNode *n;
id = getThis();
- n = php_dom_get_object(id, le_domxmlnodep, 0);
+ n = php_dom_get_object(id, le_domxmlnodep, 0 TSRMLS_CC);
if (!n) {
RETURN_FALSE;
@@ -1089,7 +1087,7 @@
int ret;
id = getThis();
- nodep = php_dom_get_object(id, le_domxmlnodep, 0);
+ nodep = php_dom_get_object(id, le_domxmlnodep, 0 TSRMLS_CC);
first = nodep->children;
if (!first) {
@@ -1112,7 +1110,7 @@
int ret;
id = getThis();
- nodep = php_dom_get_object(id, le_domxmlnodep, 0);
+ nodep = php_dom_get_object(id, le_domxmlnodep, 0 TSRMLS_CC);
last = nodep->last;
if (!last) {
@@ -1135,7 +1133,7 @@
int ret;
id = getThis();
- if(NULL == (nodep = php_dom_get_object(id, le_domxmlnodep, 0)))
+ if(NULL == (nodep = php_dom_get_object(id, le_domxmlnodep, 0 TSRMLS_CC)))
RETURN_FALSE;
first = nodep->next;
@@ -1159,7 +1157,7 @@
int ret;
id = getThis();
- if(NULL == (nodep = php_dom_get_object(id, le_domxmlnodep, 0)))
+ if(NULL == (nodep = php_dom_get_object(id, le_domxmlnodep, 0 TSRMLS_CC)))
RETURN_FALSE;
first = nodep->prev;
@@ -1184,7 +1182,7 @@
int ret;
id = getThis();
- if(NULL == (nodep = php_dom_get_object(id, le_domxmlnodep, 0)))
+ if(NULL == (nodep = php_dom_get_object(id, le_domxmlnodep, 0 TSRMLS_CC)))
RETURN_FALSE;
docp = nodep->doc;
@@ -1207,7 +1205,7 @@
xmlNode *nodep;
id = getThis();
- if(NULL == (nodep = php_dom_get_object(id, le_domxmlnodep, 0)))
+ if(NULL == (nodep = php_dom_get_object(id, le_domxmlnodep, 0 TSRMLS_CC)))
RETURN_FALSE;
if (nodep->children) {
@@ -1226,7 +1224,7 @@
xmlNode *nodep;
id = getThis();
- if(NULL == (nodep = php_dom_get_object(id, le_domxmlnodep, 0)))
+ if(NULL == (nodep = php_dom_get_object(id, le_domxmlnodep, 0 TSRMLS_CC)))
RETURN_FALSE;
if(nodep->type != XML_ELEMENT_NODE)
@@ -1249,7 +1247,7 @@
xmlNsPtr ns;
id = getThis();
- if(NULL == (nodep = php_dom_get_object(id, le_domxmlnodep, 0)))
+ if(NULL == (nodep = php_dom_get_object(id, le_domxmlnodep, 0 TSRMLS_CC)))
RETURN_FALSE;
ns = nodep->ns;
@@ -1274,7 +1272,7 @@
int ret;
id = getThis();
- nodep = php_dom_get_object(id, le_domxmlnodep, 0);
+ nodep = php_dom_get_object(id, le_domxmlnodep, 0 TSRMLS_CC);
last = nodep->parent;
if (!last) {
@@ -1296,7 +1294,7 @@
int ret;
id = getThis();
- nodep = php_dom_get_object(id, le_domxmlnodep, le_domxmldocp);
+ nodep = php_dom_get_object(id, le_domxmlnodep, le_domxmldocp TSRMLS_CC);
/* Even if the nodep is a XML_DOCUMENT_NODE the type is at the
same position.
@@ -1330,7 +1328,7 @@
xmlNode *nodep;
id = getThis();
- nodep = php_dom_get_object(id, le_domxmlnodep, 0);
+ nodep = php_dom_get_object(id, le_domxmlnodep, 0 TSRMLS_CC);
xmlUnlinkNode(nodep);
xmlFreeNode(nodep);
@@ -1351,8 +1349,8 @@
WRONG_PARAM_COUNT;
}
id = getThis();
- nodep = php_dom_get_object(id, le_domxmlnodep, 0);
- child = php_dom_get_object(node, le_domxmlnodep, 0);
+ nodep = php_dom_get_object(id, le_domxmlnodep, 0 TSRMLS_CC);
+ child = php_dom_get_object(node, le_domxmlnodep, 0 TSRMLS_CC);
if (!child || !nodep) {
RETURN_FALSE;
@@ -1378,8 +1376,8 @@
WRONG_PARAM_COUNT;
}
id = getThis();
- nodep = php_dom_get_object(id, le_domxmlnodep, 0);
- child = php_dom_get_object(node, le_domxmlnodep, 0);
+ nodep = php_dom_get_object(id, le_domxmlnodep, 0 TSRMLS_CC);
+ child = php_dom_get_object(node, le_domxmlnodep, 0 TSRMLS_CC);
if (!child || !nodep) {
RETURN_FALSE;
@@ -1405,9 +1403,9 @@
WRONG_PARAM_COUNT;
}
id = getThis();
- nodep = php_dom_get_object(id, le_domxmlnodep, 0);
- child = php_dom_get_object(node, le_domxmlnodep, 0);
- refp = php_dom_get_object(ref, le_domxmlnodep, 0);
+ nodep = php_dom_get_object(id, le_domxmlnodep, 0 TSRMLS_CC);
+ child = php_dom_get_object(node, le_domxmlnodep, 0 TSRMLS_CC);
+ refp = php_dom_get_object(ref, le_domxmlnodep, 0 TSRMLS_CC);
if (!child || !nodep || !refp) {
RETURN_FALSE;
@@ -1433,7 +1431,7 @@
}
id = getThis();
- nodep = php_dom_get_object(id, le_domxmlnodep, 0);
+ nodep = php_dom_get_object(id, le_domxmlnodep, 0 TSRMLS_CC);
convert_to_string(name);
if(name->value.str.len)
@@ -1454,7 +1452,7 @@
#endif
id = getThis();
- nodep = php_dom_get_object(id, le_domxmlnodep, 0);
+ nodep = php_dom_get_object(id, le_domxmlnodep, 0 TSRMLS_CC);
if(node_attributes(&attrs, nodep) < 0)
RETURN_FALSE;
@@ -1492,7 +1490,7 @@
WRONG_PARAM_COUNT;
}
id = getThis();
- nodep = php_dom_get_object(id, le_domxmlnodep, 0);
+ nodep = php_dom_get_object(id, le_domxmlnodep, 0 TSRMLS_CC);
convert_to_string(name);
convert_to_string(content);
@@ -1523,7 +1521,7 @@
}
id = getThis();
- nodep = php_dom_get_object(id, le_domxmlnodep, 0);
+ nodep = php_dom_get_object(id, le_domxmlnodep, 0 TSRMLS_CC);
convert_to_string(content);
if(content->value.str.len)
@@ -1548,7 +1546,7 @@
xmlNotationPtr nodep;
id = getThis();
- nodep = (xmlNotationPtr) php_dom_get_object(id, le_domxmlnotationp, 0);
+ nodep = (xmlNotationPtr) php_dom_get_object(id, le_domxmlnotationp, 0 TSRMLS_CC);
RETURN_STRING((char *) (nodep->PublicID), 1);
}
@@ -1562,7 +1560,7 @@
xmlNotationPtr nodep;
id = getThis();
- nodep = (xmlNotationPtr) php_dom_get_object(id, le_domxmlnotationp, 0);
+ nodep = (xmlNotationPtr) php_dom_get_object(id, le_domxmlnotationp, 0 TSRMLS_CC);
RETURN_STRING((char *) (nodep->SystemID), 1);
}
@@ -1604,7 +1602,7 @@
xmlNode *nodep;
id = getThis();
- nodep = php_dom_get_object(id, le_domxmlelementp, 0);
+ nodep = php_dom_get_object(id, le_domxmlelementp, 0 TSRMLS_CC);
RETURN_STRING((char *) (nodep->name), 1);
}
@@ -1620,7 +1618,7 @@
if ((ZEND_NUM_ARGS() == 1) && getParameters(ht, 1, &arg1) == SUCCESS) {
id = getThis();
- nodep = php_dom_get_object(id, le_domxmlelementp, 0);
+ nodep = php_dom_get_object(id, le_domxmlelementp, 0 TSRMLS_CC);
} else {
WRONG_PARAM_COUNT;
}
@@ -1647,7 +1645,7 @@
if ((ZEND_NUM_ARGS() == 2) && getParameters(ht, 2, &arg1, &arg2) == SUCCESS) {
id = getThis();
- nodep = php_dom_get_object(id, le_domxmlelementp, 0);
+ nodep = php_dom_get_object(id, le_domxmlelementp, 0 TSRMLS_CC);
} else {
WRONG_PARAM_COUNT;
}
@@ -1676,7 +1674,7 @@
if ((ZEND_NUM_ARGS() == 1) && getParameters(ht, 1, &arg1) == SUCCESS) {
id = getThis();
- nodep = php_dom_get_object(id, le_domxmlelementp, 0);
+ nodep = php_dom_get_object(id, le_domxmlelementp, 0 TSRMLS_CC);
} else {
WRONG_PARAM_COUNT;
}
@@ -1697,7 +1695,7 @@
if ((ZEND_NUM_ARGS() == 1) && getParameters(ht, 1, &arg1) == SUCCESS) {
id = getThis();
- nodep = php_dom_get_object(id, le_domxmlelementp, 0);
+ nodep = php_dom_get_object(id, le_domxmlelementp, 0 TSRMLS_CC);
} else {
WRONG_PARAM_COUNT;
}
@@ -1720,8 +1718,8 @@
if ((ZEND_NUM_ARGS() == 1) && getParameters(ht, 1, &arg1) == SUCCESS) {
id = getThis();
- nodep = php_dom_get_object(id, le_domxmlelementp, 0);
- attrp = php_dom_get_object(arg1, le_domxmlattrp, 0);
+ nodep = php_dom_get_object(id, le_domxmlelementp, 0 TSRMLS_CC);
+ attrp = php_dom_get_object(arg1, le_domxmlattrp, 0 TSRMLS_CC);
} else {
WRONG_PARAM_COUNT;
}
@@ -1741,7 +1739,7 @@
if ((ZEND_NUM_ARGS() == 1) && getParameters(ht, 1, &arg1) == SUCCESS) {
id = getThis();
- nodep = php_dom_get_object(id, le_domxmlelementp, 0);
+ nodep = php_dom_get_object(id, le_domxmlelementp, 0 TSRMLS_CC);
} else {
WRONG_PARAM_COUNT;
}
@@ -1764,7 +1762,7 @@
xmlNodePtr attrp;
id = getThis();
- attrp = php_dom_get_object(id, le_domxmldoctypep, 0);
+ attrp = php_dom_get_object(id, le_domxmldoctypep, 0 TSRMLS_CC);
RETURN_STRING((char *) (attrp->name), 1);
}
@@ -1784,7 +1782,7 @@
int ret;
id = getThis();
- if(NULL == (docp = php_dom_get_object(id, le_domxmldocp, 0))) {
+ if(NULL == (docp = php_dom_get_object(id, le_domxmldocp, 0 TSRMLS_CC))) {
RETURN_FALSE;
}
@@ -1804,7 +1802,7 @@
xmlDocPtr docp;
id = getThis();
- if(NULL == (docp = php_dom_get_object(id, le_domxmldocp, 0))) {
+ if(NULL == (docp = php_dom_get_object(id, le_domxmldocp, 0 TSRMLS_CC))) {
RETURN_FALSE;
}
@@ -1832,7 +1830,7 @@
}
}
- docp = php_dom_get_object(id, le_domxmldocp, 0);
+ docp = php_dom_get_object(id, le_domxmldocp, 0 TSRMLS_CC);
node = docp->children;
if (!node) {
@@ -1863,7 +1861,7 @@
int ret;
id = getThis();
- if(NULL == (docp = php_dom_get_object(id, le_domxmldocp, 0))) {
+ if(NULL == (docp = php_dom_get_object(id, le_domxmldocp, 0 TSRMLS_CC))) {
RETURN_FALSE;
}
@@ -1895,7 +1893,7 @@
int ret;
id = getThis();
- if(NULL == (docp = php_dom_get_object(id, le_domxmldocp, 0))) {
+ if(NULL == (docp = php_dom_get_object(id, le_domxmldocp, 0 TSRMLS_CC))) {
RETURN_FALSE;
}
@@ -1927,7 +1925,7 @@
int ret;
id = getThis();
- if(NULL == (docp = php_dom_get_object(id, le_domxmldocp, 0))) {
+ if(NULL == (docp = php_dom_get_object(id, le_domxmldocp, 0 TSRMLS_CC))) {
RETURN_FALSE;
}
@@ -1959,7 +1957,7 @@
int ret;
id = getThis();
- if(NULL == (docp = php_dom_get_object(id, le_domxmldocp, 0))) {
+ if(NULL == (docp = php_dom_get_object(id, le_domxmldocp, 0 TSRMLS_CC))) {
RETURN_FALSE;
}
@@ -1992,7 +1990,7 @@
int ret;
id = getThis();
- if(NULL == (docp = php_dom_get_object(id, le_domxmldocp, 0))) {
+ if(NULL == (docp = php_dom_get_object(id, le_domxmldocp, 0 TSRMLS_CC))) {
RETURN_FALSE;
}
@@ -2025,14 +2023,14 @@
int ret;
id = getThis();
- if(NULL == (docp = php_dom_get_object(id, le_domxmldocp, 0))) {
+ if(NULL == (docp = php_dom_get_object(id, le_domxmldocp, 0 TSRMLS_CC))) {
RETURN_FALSE;
}
if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) {
WRONG_PARAM_COUNT;
}
- srcnode = php_dom_get_object(arg1, le_domxmlnodep, 0);
+ srcnode = php_dom_get_object(arg1, le_domxmlnodep, 0 TSRMLS_CC);
if(!srcnode)
RETURN_FALSE;
@@ -2061,7 +2059,7 @@
int ret;
id = getThis();
- docp = php_dom_get_object(id, le_domxmldocp, 0);
+ docp = php_dom_get_object(id, le_domxmldocp, 0 TSRMLS_CC);
dtd = xmlGetIntSubset(docp);
if (!dtd) {
@@ -2084,7 +2082,7 @@
int size;
id = getThis();
- if(NULL == (docp = php_dom_get_object(id, le_domxmldocp, 0))) {
+ if(NULL == (docp = php_dom_get_object(id, le_domxmldocp, 0 TSRMLS_CC))) {
RETURN_FALSE;
}
@@ -2182,7 +2180,7 @@
}
id = getThis();
- nodep = php_dom_get_object(id, le_domxmlnodep, 0);
+ nodep = php_dom_get_object(id, le_domxmlnodep, 0 TSRMLS_CC);
convert_to_string(content);
if(content->value.str.len)
@@ -2206,7 +2204,7 @@
}
id = getThis();
- docp = php_dom_get_object(id, le_domxmldocp, 0);
+ docp = php_dom_get_object(id, le_domxmldocp, 0 TSRMLS_CC);
convert_to_string(name);
nodep = xmlNewDocNode(docp, NULL, name->value.str.val, NULL);
@@ -2433,7 +2431,7 @@
int ret;
id = getThis();
- docp = php_dom_get_object(id, le_domxmldocp, 0);
+ docp = php_dom_get_object(id, le_domxmldocp, 0 TSRMLS_CC);
#if defined(LIBXML_XPTR_ENABLED)
if(mode == PHP_XPTR)
@@ -2477,7 +2475,7 @@
}
id = getThis();
- ctxp = php_xpath_get_context(id, le_xpathctxp, 0);
+ ctxp = php_xpath_get_context(id, le_xpathctxp, 0 TSRMLS_CC);
convert_to_string(str);
#if defined(LIBXML_XPTR_ENABLED)
Index: php4/ext/dotnet/dotnet.cpp
diff -u php4/ext/dotnet/dotnet.cpp:1.12 php4/ext/dotnet/dotnet.cpp:1.13
--- php4/ext/dotnet/dotnet.cpp:1.12 Sun Jul 29 21:56:24 2001
+++ php4/ext/dotnet/dotnet.cpp Tue Jul 31 00:53:47 2001
@@ -184,10 +184,8 @@
}
}
-void php_register_DOTNET_class(void)
+void php_register_DOTNET_class(TSRMLS_D)
{
- TSRMLS_FETCH();
-
INIT_OVERLOADED_CLASS_ENTRY(dotnet_class_entry, "DOTNET", NULL,
php_DOTNET_call_function_handler,
php_COM_get_property_handler,
@@ -210,11 +208,14 @@
PHP_MINIT_FUNCTION(DOTNET)
{
HRESULT hr;
+
CoInitialize(0);
hr = dotnet_init();
- if (FAILED(hr)) return hr;
+ if (FAILED(hr)) {
+ return hr;
+ }
- php_register_DOTNET_class();
+ php_register_DOTNET_class(TSRMLS_C);
return SUCCESS;
}
Index: php4/ext/fdf/fdf.c
diff -u php4/ext/fdf/fdf.c:1.53 php4/ext/fdf/fdf.c:1.54
--- php4/ext/fdf/fdf.c:1.53 Sat Jul 28 07:35:49 2001
+++ php4/ext/fdf/fdf.c Tue Jul 31 00:53:47 2001
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fdf.c,v 1.53 2001/07/28 11:35:49 zeev Exp $ */
+/* $Id: fdf.c,v 1.54 2001/07/31 04:53:47 zeev Exp $ */
/* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html. */
@@ -725,7 +725,6 @@
FDFErc err;
ASInt32 nBytes;
zval *array_ptr = (zval *) arg;
- TSRMLS_FETCH();
fp=php_open_temporary_file(NULL,"fdfdata.",&filename);
if(!fp) {
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.26 php4/ext/mbstring/mbstring.c:1.27
--- php4/ext/mbstring/mbstring.c:1.26 Mon Jul 30 02:17:56 2001
+++ php4/ext/mbstring/mbstring.c Tue Jul 31 00:53:47 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.26 2001/07/30 06:17:56 zeev Exp $ */
+/* $Id: mbstring.c,v 1.27 2001/07/31 04:53:47 zeev Exp $ */
/*
* PHP4 Multibyte String module "mbstring" (currently only for Japanese)
@@ -925,8 +925,6 @@
#if !defined(COMPILE_DL_MBSTRING)
SAPI_POST_HANDLER_FUNC(php_mbstr_post_handler)
{
- TSRMLS_FETCH();
-
MBSTRG(http_input_identify_post) = mbfl_no_encoding_invalid;
php_mbstr_encoding_handler(arg, SG(request_info).post_data, "&");
Index: php4/ext/mssql/php_mssql.c
diff -u php4/ext/mssql/php_mssql.c:1.62 php4/ext/mssql/php_mssql.c:1.63
--- php4/ext/mssql/php_mssql.c:1.62 Mon Jul 30 13:27:08 2001
+++ php4/ext/mssql/php_mssql.c Tue Jul 31 00:53:47 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.62 2001/07/30 17:27:08 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.63 2001/07/31 04:53:47 zeev Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -157,10 +157,8 @@
return 0;
}
-static int _clean_invalid_results(list_entry *le)
+static int _clean_invalid_results(list_entry *le TSRMLS_DC)
{
- TSRMLS_FETCH();
-
if (le->type == le_result) {
mssql_link *mssql_ptr = ((mssql_result *) le->ptr)->mssql_ptr;
@@ -230,7 +228,7 @@
TSRMLS_FETCH();
mssql_ptr->valid = 0;
- zend_hash_apply(&EG(regular_list),(apply_func_t) _clean_invalid_results);
+ zend_hash_apply(&EG(regular_list),(apply_func_t) _clean_invalid_results TSRMLS_CC);
dbclose(mssql_ptr->link);
dbfreelogin(mssql_ptr->login);
efree(mssql_ptr);
Index: php4/ext/oci8/oci8.c
diff -u php4/ext/oci8/oci8.c:1.141 php4/ext/oci8/oci8.c:1.142
--- php4/ext/oci8/oci8.c:1.141 Mon Jul 30 02:17:59 2001
+++ php4/ext/oci8/oci8.c Tue Jul 31 00:53:48 2001
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.141 2001/07/30 06:17:59 zeev Exp $ */
+/* $Id: oci8.c,v 1.142 2001/07/31 04:53:48 zeev Exp $ */
/* TODO list:
*
@@ -519,14 +519,14 @@
return SUCCESS;
}
-static int _session_pcleanup(oci_session *session)
+static int _session_pcleanup(oci_session *session TSRMLS_DC)
{
_oci_close_session(session);
return 1;
}
-static int _server_pcleanup(oci_server *server)
+static int _server_pcleanup(oci_server *server TSRMLS_DC)
{
_oci_close_server(server);
@@ -539,8 +539,8 @@
oci_debug("START php_mshutdown_oci");
- zend_hash_apply(OCI(user), (apply_func_t)_session_pcleanup);
- zend_hash_apply(OCI(server), (apply_func_t)_server_pcleanup);
+ zend_hash_apply(OCI(user), (apply_func_t)_session_pcleanup TSRMLS_CC);
+ zend_hash_apply(OCI(server), (apply_func_t)_server_pcleanup TSRMLS_CC);
zend_hash_destroy(OCI(user));
zend_hash_destroy(OCI(server));
@@ -562,8 +562,8 @@
#if 0
/* XXX free all statements, rollback all outstanding transactions */
- zend_hash_apply(OCI(user), (apply_func_t) _session_cleanup);
- zend_hash_apply(OCI(server), (apply_func_t) _server_cleanup);
+ zend_hash_apply(OCI(user), (apply_func_t) _session_cleanup TSRMLS_CC);
+ zend_hash_apply(OCI(server), (apply_func_t) _server_cleanup TSRMLS_CC);
#endif
oci_debug("END php_rshutdown_oci");
@@ -577,7 +577,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.141 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.142 $");
#ifndef PHP_WIN32
php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION );
php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR );
@@ -622,7 +622,7 @@
/* {{{ _oci_bind_pre_exec() */
static int
-_oci_bind_pre_exec(void *data)
+_oci_bind_pre_exec(void *data TSRMLS_DC)
{
oci_bind *bind = (oci_bind *) data;
@@ -637,7 +637,7 @@
/* {{{ _oci_bind_post_exec() */
static int
-_oci_bind_post_exec(void *data)
+_oci_bind_post_exec(void *data TSRMLS_DC)
{
oci_bind *bind = (oci_bind *) data;
@@ -1319,6 +1319,7 @@
int dtype;
dvoid *buf;
oci_descriptor *descr;
+ TSRMLS_FETCH();
statement->error =
oci_error(statement->pError,
@@ -1346,7 +1347,7 @@
we don't want to execute!!! */
if (statement->binds) {
- zend_hash_apply(statement->binds, (apply_func_t) _oci_bind_pre_exec);
+ zend_hash_apply(statement->binds, (apply_func_t) _oci_bind_pre_exec TSRMLS_CC);
}
statement->error =
@@ -1361,7 +1362,7 @@
NULL,
mode));
if (statement->binds) {
- zend_hash_apply(statement->binds, (apply_func_t) _oci_bind_post_exec);
+ zend_hash_apply(statement->binds, (apply_func_t) _oci_bind_post_exec TSRMLS_CC);
}
oci_handle_error(statement->conn, statement->error);
@@ -1612,7 +1613,7 @@
/* {{{ oci_fetch() */
static int
-_oci_column_pre_fetch(void *data)
+_oci_column_pre_fetch(void *data TSRMLS_DC)
{
oci_out_column *col = (oci_out_column *) data;
@@ -1631,7 +1632,7 @@
oci_out_column *column;
if (statement->columns) {
- zend_hash_apply(statement->columns, (apply_func_t) _oci_column_pre_fetch);
+ zend_hash_apply(statement->columns, (apply_func_t) _oci_column_pre_fetch \
TSRMLS_CC); }
statement->error =
@@ -2338,7 +2339,7 @@
/* {{{ _oci_close_server()
*/
-static int _oci_session_cleanup(void *data)
+static int _oci_session_cleanup(void *data TSRMLS_DC)
{
list_entry *le = (list_entry *) data;
if (le->type == le_session) {
@@ -2356,12 +2357,11 @@
char *dbname;
int oldopen;
TSRMLS_FETCH();
- TSRMLS_FETCH();
oldopen = server->is_open;
server->is_open = 2;
if (! OCI(shutdown)) {
- zend_hash_apply(&EG(regular_list), _oci_session_cleanup);
+ zend_hash_apply(&EG(regular_list), (apply_func_t) _oci_session_cleanup TSRMLS_CC);
}
server->is_open = oldopen;
@@ -3917,7 +3917,7 @@
connection->is_open = 0;
- zend_hash_apply(list, (apply_func_t) _stmt_cleanup);
+ zend_hash_apply(list, (apply_func_t) _stmt_cleanup TSRMLS_CC);
if (zend_list_delete(connection->id) == SUCCESS) {
RETURN_TRUE;
Index: php4/ext/odbc/php_odbc.c
diff -u php4/ext/odbc/php_odbc.c:1.100 php4/ext/odbc/php_odbc.c:1.101
--- php4/ext/odbc/php_odbc.c:1.100 Mon Jul 30 04:24:30 2001
+++ php4/ext/odbc/php_odbc.c Tue Jul 31 00:53:49 2001
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.100 2001/07/30 08:24:30 zeev Exp $ */
+/* $Id: php_odbc.c,v 1.101 2001/07/31 04:53:49 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -644,9 +644,8 @@
RETURN_TRUE;
}
-static int _close_pconn_with_id(list_entry *le, int *id)
+static int _close_pconn_with_id(list_entry *le, int *id TSRMLS_DC)
{
-
if(le->type == le_pconn && (((odbc_connection *)(le->ptr))->id == *id)){
return 1;
}else{
@@ -733,7 +732,7 @@
zend_list_delete(i);
/* Delete the persistent connection */
zend_hash_apply_with_argument(&EG(persistent_list),
- (int (*)(void *, void *)) _close_pconn_with_id, (void *) &i);
+ (apply_func_arg_t) _close_pconn_with_id, (void *) &i TSRMLS_CC);
}
}
}
@@ -2222,7 +2221,7 @@
if(is_pconn){
zend_hash_apply_with_argument(&EG(persistent_list),
- (int (*)(void *, void *)) _close_pconn_with_id, (void *) \
&((*pv_conn)->value.lval)); + (apply_func_arg_t) _close_pconn_with_id, (void *) \
&((*pv_conn)->value.lval) TSRMLS_CC); }
}
/* }}} */
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.119 php4/ext/pgsql/pgsql.c:1.120
--- php4/ext/pgsql/pgsql.c:1.119 Mon Jul 30 04:24:32 2001
+++ php4/ext/pgsql/pgsql.c Tue Jul 31 00:53:49 2001
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql.c,v 1.119 2001/07/30 08:24:32 zeev Exp $ */
+/* $Id: pgsql.c,v 1.120 2001/07/31 04:53:49 zeev Exp $ */
#include <stdlib.h>
@@ -187,10 +187,9 @@
/* {{{ _rollback_transactions
*/
-static int _rollback_transactions(zend_rsrc_list_entry *rsrc)
+static int _rollback_transactions(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{
PGconn *link;
- TSRMLS_FETCH();
if (rsrc->type != le_plink)
return 0;
@@ -293,7 +292,7 @@
*/
PHP_RSHUTDOWN_FUNCTION(pgsql)
{
- zend_hash_apply(&EG(persistent_list), (apply_func_t) _rollback_transactions);
+ zend_hash_apply(&EG(persistent_list), (apply_func_t) _rollback_transactions \
TSRMLS_CC); return SUCCESS;
}
/* }}} */
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.368 \
php4/ext/standard/basic_functions.c:1.369
--- php4/ext/standard/basic_functions.c:1.368 Mon Jul 30 04:24:35 2001
+++ php4/ext/standard/basic_functions.c Tue Jul 31 00:53:49 2001
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.368 2001/07/30 08:24:35 zeev Exp $ */
+/* $Id: basic_functions.c,v 1.369 2001/07/31 04:53:49 zeev Exp $ */
#include "php.h"
#include "php_main.h"
@@ -1801,10 +1801,9 @@
efree(tick_function_entry->arguments);
}
-static int user_shutdown_function_call(php_shutdown_function_entry \
*shutdown_function_entry) +static int \
user_shutdown_function_call(php_shutdown_function_entry *shutdown_function_entry \
TSRMLS_DC) {
zval retval;
- TSRMLS_FETCH();
if (call_user_function(EG(function_table), NULL, \
shutdown_function_entry->arguments[0], &retval, shutdown_function_entry->arg_count-1, \
shutdown_function_entry->arguments+1 TSRMLS_CC)==SUCCESS) { zval_dtor(&retval);
@@ -1815,11 +1814,10 @@
return 0;
}
-static void user_tick_function_call(user_tick_function_entry *tick_fe)
+static void user_tick_function_call(user_tick_function_entry *tick_fe TSRMLS_DC)
{
zval retval;
zval *function = tick_fe->arguments[0];
- TSRMLS_FETCH();
if (call_user_function(EG(function_table), NULL, function, &retval,
tick_fe->arg_count - 1, tick_fe->arguments+1 TSRMLS_CC) == SUCCESS) {
@@ -1846,7 +1844,7 @@
{
TSRMLS_FETCH();
- zend_llist_apply(BG(user_tick_functions), \
(llist_apply_func_t)user_tick_function_call); \
+ zend_llist_apply(BG(user_tick_functions), (llist_apply_func_t) \
user_tick_function_call TSRMLS_CC); }
static int user_tick_function_compare(user_tick_function_entry *tick_fe1,
@@ -1871,7 +1869,7 @@
TSRMLS_FETCH();
if (BG(user_shutdown_function_names)) zend_try {
- zend_hash_apply(BG(user_shutdown_function_names), (apply_func_t) \
user_shutdown_function_call); + zend_hash_apply(BG(user_shutdown_function_names), \
(apply_func_t) user_shutdown_function_call TSRMLS_CC); memcpy(&EG(bailout), \
&orig_bailout, sizeof(jmp_buf)); \
zend_hash_destroy(BG(user_shutdown_function_names)); \
efree(BG(user_shutdown_function_names));
Index: php4/ext/standard/info.c
diff -u php4/ext/standard/info.c:1.146 php4/ext/standard/info.c:1.147
--- php4/ext/standard/info.c:1.146 Mon Jul 30 05:16:44 2001
+++ php4/ext/standard/info.c Tue Jul 31 00:53:50 2001
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: info.c,v 1.146 2001/07/30 09:16:44 zeev Exp $ */
+/* $Id: info.c,v 1.147 2001/07/31 04:53:50 zeev Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -39,10 +39,9 @@
/* {{{ _display_module_info
*/
-static int _display_module_info(zend_module_entry *module, void *arg)
+static int _display_module_info(zend_module_entry *module, void *arg TSRMLS_DC)
{
int show_info_func = *((int *) arg);
- TSRMLS_FETCH();
if (show_info_func && module->info_func) {
php_printf("<h2 align=\"center\"><a name=\"module_%s\">%s</a></h2>\n", \
module->name, module->name); @@ -256,12 +255,12 @@
int show_info_func;
show_info_func = 1;
- zend_hash_apply_with_argument(&module_registry, (int (*)(void *, void *)) \
_display_module_info, &show_info_func); \
+ zend_hash_apply_with_argument(&module_registry, (apply_func_arg_t) \
_display_module_info, &show_info_func TSRMLS_CC);
SECTION("Additional Modules");
php_info_print_table_start();
show_info_func = 0;
- zend_hash_apply_with_argument(&module_registry, (int (*)(void *, void *)) \
_display_module_info, &show_info_func); \
+ zend_hash_apply_with_argument(&module_registry, (apply_func_arg_t) \
_display_module_info, &show_info_func TSRMLS_CC); php_info_print_table_end();
}
Index: php4/ext/sybase/php_sybase_db.c
diff -u php4/ext/sybase/php_sybase_db.c:1.24 php4/ext/sybase/php_sybase_db.c:1.25
--- php4/ext/sybase/php_sybase_db.c:1.24 Mon Jul 30 02:18:06 2001
+++ php4/ext/sybase/php_sybase_db.c Tue Jul 31 00:53:50 2001
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sybase_db.c,v 1.24 2001/07/30 06:18:06 zeev Exp $ */
+/* $Id: php_sybase_db.c,v 1.25 2001/07/31 04:53:50 zeev Exp $ */
#ifdef HAVE_CONFIG_H
@@ -125,7 +125,7 @@
}
-static int _clean_invalid_results(list_entry *le)
+static int _clean_invalid_results(list_entry *le TSRMLS_DC)
{
if (le->type == php_sybase_module.le_result) {
sybase_link *sybase_ptr = ((sybase_result *) le->ptr)->sybase_ptr;
@@ -177,7 +177,7 @@
will *not* be in a consistent state. thies@thieso.net
*/
- zend_hash_apply(&EG(regular_list), (apply_func_t) _clean_invalid_results);
+ zend_hash_apply(&EG(regular_list), (apply_func_t) _clean_invalid_results \
TSRMLS_CC); dbclose(sybase_ptr->link);
dbloginfree(sybase_ptr->login);
efree(sybase_ptr);
Index: php4/ext/sybase_ct/php_sybase_ct.c
diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.56 \
php4/ext/sybase_ct/php_sybase_ct.c:1.57
--- php4/ext/sybase_ct/php_sybase_ct.c:1.56 Mon Jul 30 02:18:07 2001
+++ php4/ext/sybase_ct/php_sybase_ct.c Tue Jul 31 00:53:51 2001
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sybase_ct.c,v 1.56 2001/07/30 06:18:07 zeev Exp $ */
+/* $Id: php_sybase_ct.c,v 1.57 2001/07/31 04:53:51 zeev Exp $ */
#ifdef HAVE_CONFIG_H
@@ -95,10 +95,8 @@
#define CHECK_LINK(link) { if (link==-1) { php_error(E_WARNING, "Sybase: A link to \
the server could not be established"); RETURN_FALSE; } }
-static int _clean_invalid_results(list_entry *le)
+static int _clean_invalid_results(list_entry *le TSRMLS_DC)
{
- TSRMLS_FETCH();
-
if (le->type == le_result) {
sybase_link *sybase_ptr = ((sybase_result *) le->ptr)->sybase_ptr;
@@ -149,7 +147,7 @@
sybase_ptr->valid = 0;
- zend_hash_apply(&EG(regular_list), (apply_func_t) _clean_invalid_results);
+ zend_hash_apply(&EG(regular_list), (apply_func_t) _clean_invalid_results \
TSRMLS_CC);
/* Non-persistent connections will always be connected or we wouldn't
* get here, but since we want to check the death status anyway
Index: php4/main/SAPI.c
diff -u php4/main/SAPI.c:1.110 php4/main/SAPI.c:1.111
--- php4/main/SAPI.c:1.110 Sat Jul 28 07:36:26 2001
+++ php4/main/SAPI.c Tue Jul 31 00:53:51 2001
@@ -496,17 +496,17 @@
http_status_line.header = SG(sapi_headers).http_status_line;
http_status_line.header_len = strlen(SG(sapi_headers).http_status_line);
- sapi_module.send_header(&http_status_line, SG(server_context));
+ sapi_module.send_header(&http_status_line, SG(server_context) TSRMLS_CC);
}
- zend_llist_apply_with_argument(&SG(sapi_headers).headers, (void (*)(void *, void \
*)) sapi_module.send_header, SG(server_context)); \
+ zend_llist_apply_with_argument(&SG(sapi_headers).headers, \
(llist_apply_with_arg_func_t) sapi_module.send_header, SG(server_context) TSRMLS_CC); \
if(SG(sapi_headers).send_default_content_type) { sapi_header_struct default_header;
sapi_get_default_content_type_header(&default_header TSRMLS_CC);
- sapi_module.send_header(&default_header, SG(server_context));
+ sapi_module.send_header(&default_header, SG(server_context) TSRMLS_CC);
sapi_free_header(&default_header);
}
- sapi_module.send_header(NULL, SG(server_context));
+ sapi_module.send_header(NULL, SG(server_context) TSRMLS_CC);
ret = SUCCESS;
break;
case SAPI_HEADER_SEND_FAILED:
Index: php4/main/SAPI.h
diff -u php4/main/SAPI.h:1.71 php4/main/SAPI.h:1.72
--- php4/main/SAPI.h:1.71 Sat Jul 28 07:36:26 2001
+++ php4/main/SAPI.h Tue Jul 31 00:53:51 2001
@@ -169,7 +169,7 @@
int (*header_handler)(sapi_header_struct *sapi_header, sapi_headers_struct \
*sapi_headers TSRMLS_DC); int (*send_headers)(sapi_headers_struct *sapi_headers \
TSRMLS_DC);
- void (*send_header)(sapi_header_struct *sapi_header, void *server_context);
+ void (*send_header)(sapi_header_struct *sapi_header, void *server_context \
TSRMLS_DC);
int (*read_post)(char *buffer, uint count_bytes TSRMLS_DC);
char *(*read_cookies)(TSRMLS_D);
Index: php4/main/main.c
diff -u php4/main/main.c:1.390 php4/main/main.c:1.391
--- php4/main/main.c:1.390 Mon Jul 30 04:24:40 2001
+++ php4/main/main.c Tue Jul 31 00:53:52 2001
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.390 2001/07/30 08:24:40 zeev Exp $ */
+/* $Id: main.c,v 1.391 2001/07/31 04:53:52 zeev Exp $ */
/* {{{ includes
*/
@@ -128,7 +128,7 @@
/* {{{ php_disable_functions
*/
-static void php_disable_functions()
+static void php_disable_functions(TSRMLS_D)
{
char *func;
char *new_value_dup = strdup(INI_STR("disable_functions")); /* This is an \
intentional leak, @@ -137,7 +137,7 @@
func = strtok(new_value_dup, ", ");
while (func) {
- zend_disable_function(func, strlen(func));
+ zend_disable_function(func, strlen(func) TSRMLS_CC);
func = strtok(NULL, ", ");
}
}
@@ -655,7 +655,7 @@
/* PG(during_request_startup) = 0; */
php_hash_environment(TSRMLS_C);
- zend_activate_modules();
+ zend_activate_modules(TSRMLS_C);
PG(modules_activated)=1;
} zend_catch {
retval = FAILURE;
@@ -909,10 +909,10 @@
which is always an internal extension and to be initialized
ahead of all other internals
*/
- php_ini_delayed_modules_startup();
+ php_ini_delayed_modules_startup(TSRMLS_C);
/* disable certain functions as requested by php.ini */
- php_disable_functions();
+ php_disable_functions(TSRMLS_C);
zend_startup_extensions();
@@ -961,7 +961,7 @@
php_shutdown_ticks(TSRMLS_C);
sapi_flush();
- zend_shutdown();
+ zend_shutdown(TSRMLS_C);
php_shutdown_fopen_wrappers();
php_shutdown_info_logos();
UNREGISTER_INI_ENTRIES();
Index: php4/main/php_ini.c
diff -u php4/main/php_ini.c:1.64 php4/main/php_ini.c:1.65
--- php4/main/php_ini.c:1.64 Sat Jul 28 07:36:28 2001
+++ php4/main/php_ini.c Tue Jul 31 00:53:52 2001
@@ -77,7 +77,7 @@
/* {{{ php_ini_displayer
*/
-static int php_ini_displayer(zend_ini_entry *ini_entry, int module_number)
+static int php_ini_displayer(zend_ini_entry *ini_entry, int module_number TSRMLS_DC)
{
if (ini_entry->module_number != module_number) {
return 0;
@@ -109,7 +109,7 @@
}
php_info_print_table_start();
php_info_print_table_header(3, "Directive", "Local Value", "Master Value");
- zend_hash_apply_with_argument(&EG(ini_directives), (apply_func_arg_t) \
php_ini_displayer, (void *) (long) module_number); \
+ zend_hash_apply_with_argument(&EG(ini_directives), (apply_func_arg_t) \
php_ini_displayer, (void *) (long) module_number TSRMLS_CC); \
php_info_print_table_end(); }
/* }}} */
@@ -176,7 +176,7 @@
/* {{{ php_load_function_extension_cb
*/
-static void php_load_function_extension_cb(void *arg)
+static void php_load_function_extension_cb(void *arg TSRMLS_DC)
{
zval *extension = (zval *) arg;
zval zval;
@@ -187,7 +187,7 @@
/* {{{ php_load_zend_extension_cb
*/
-static void php_load_zend_extension_cb(void *arg)
+static void php_load_zend_extension_cb(void *arg TSRMLS_DC)
{
zend_load_extension(*((char **) arg));
}
@@ -294,10 +294,10 @@
/* {{{ php_ini_delayed_modules_startup
*/
-void php_ini_delayed_modules_startup(void)
+void php_ini_delayed_modules_startup(TSRMLS_D)
{
- zend_llist_apply(&extension_lists.engine, php_load_zend_extension_cb);
- zend_llist_apply(&extension_lists.functions, php_load_function_extension_cb);
+ zend_llist_apply(&extension_lists.engine, php_load_zend_extension_cb TSRMLS_CC);
+ zend_llist_apply(&extension_lists.functions, php_load_function_extension_cb \
TSRMLS_CC);
zend_llist_destroy(&extension_lists.engine);
zend_llist_destroy(&extension_lists.functions);
Index: php4/main/php_ini.h
diff -u php4/main/php_ini.h:1.34 php4/main/php_ini.h:1.35
--- php4/main/php_ini.h:1.34 Sat Mar 17 18:35:32 2001
+++ php4/main/php_ini.h Tue Jul 31 00:53:52 2001
@@ -23,7 +23,7 @@
int php_init_config(char *php_ini_path_override);
int php_shutdown_config(void);
-void php_ini_delayed_modules_startup(void);
+void php_ini_delayed_modules_startup(TSRMLS_D);
zval *cfg_get_entry(char *name, uint name_length);
#define PHP_INI_USER ZEND_INI_USER
Index: php4/main/php_ticks.c
diff -u php4/main/php_ticks.c:1.8 php4/main/php_ticks.c:1.9
--- php4/main/php_ticks.c:1.8 Sat Jul 28 07:36:28 2001
+++ php4/main/php_ticks.c Tue Jul 31 00:53:52 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ticks.c,v 1.8 2001/07/28 11:36:28 zeev Exp $ */
+/* $Id: php_ticks.c,v 1.9 2001/07/31 04:53:52 zeev Exp $ */
#include "php.h"
#include "php_ticks.h"
@@ -56,19 +56,20 @@
(int(*)(void*,void*))php_compare_tick_functions);
}
-static void php_tick_iterator(void *data, void *arg)
+static void php_tick_iterator(void *data, void *arg TSRMLS_DC)
{
void (*func)(int);
memcpy(&func, data, sizeof(void(*)(int)));
func(*((int *)arg));
+ return SUCCESS;
}
void php_run_ticks(int count)
{
TSRMLS_FETCH();
- zend_llist_apply_with_argument(&PG(tick_functions), \
(void(*)(void*,void*))php_tick_iterator, &count); \
+ zend_llist_apply_with_argument(&PG(tick_functions), (llist_apply_with_arg_func_t) \
php_tick_iterator, &count TSRMLS_CC); }
/*
Index: php4/main/rfc1867.c
diff -u php4/main/rfc1867.c:1.69 php4/main/rfc1867.c:1.70
--- php4/main/rfc1867.c:1.69 Sat Jul 28 07:36:28 2001
+++ php4/main/rfc1867.c Tue Jul 31 00:53:52 2001
@@ -15,7 +15,7 @@
| Authors: Rasmus Lerdorf <rasmus@php.net> |
+----------------------------------------------------------------------+
*/
-/* $Id: rfc1867.c,v 1.69 2001/07/28 11:36:28 zeev Exp $ */
+/* $Id: rfc1867.c,v 1.70 2001/07/31 04:53:52 zeev Exp $ */
#include <stdio.h>
#include "php.h"
@@ -83,7 +83,7 @@
}
-static int unlink_filename(char **filename)
+static int unlink_filename(char **filename TSRMLS_DC)
{
VCWD_UNLINK(*filename);
return 0;
@@ -92,7 +92,7 @@
void destroy_uploaded_files_hash(TSRMLS_D)
{
- zend_hash_apply(SG(rfc1867_uploaded_files), (apply_func_t) unlink_filename);
+ zend_hash_apply(SG(rfc1867_uploaded_files), (apply_func_t) unlink_filename \
TSRMLS_CC); zend_hash_destroy(SG(rfc1867_uploaded_files));
FREE_HASHTABLE(SG(rfc1867_uploaded_files));
}
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.112 php4/sapi/apache/mod_php4.c:1.113
--- php4/sapi/apache/mod_php4.c:1.112 Mon Jul 30 10:25:29 2001
+++ php4/sapi/apache/mod_php4.c Tue Jul 31 00:53:53 2001
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php4.c,v 1.112 2001/07/30 14:25:29 thies Exp $ */
+/* $Id: mod_php4.c,v 1.113 2001/07/31 04:53:53 zeev Exp $ */
#define NO_REGEX_EXTRA_H
#ifdef WIN32
@@ -459,7 +459,7 @@
/* {{{ php_apache_alter_ini_entries
*/
-static int php_apache_alter_ini_entries(php_per_dir_entry *per_dir_entry)
+static int php_apache_alter_ini_entries(php_per_dir_entry *per_dir_entry TSRMLS_DC)
{
zend_alter_ini_entry(per_dir_entry->key, per_dir_entry->key_length+1, \
per_dir_entry->value, per_dir_entry->value_length, per_dir_entry->type, \
PHP_INI_STAGE_ACTIVATE); return 0;
@@ -493,8 +493,6 @@
int retval;
HashTable *per_dir_conf;
TSRMLS_FETCH();
- TSRMLS_FETCH();
- TSRMLS_FETCH();
if (AP(in_request)) {
zend_file_handle fh;
@@ -521,7 +519,7 @@
per_dir_conf = (HashTable *) get_module_config(r->per_dir_config, &php4_module);
if (per_dir_conf) {
- zend_hash_apply((HashTable *) per_dir_conf, (apply_func_t) \
php_apache_alter_ini_entries); + zend_hash_apply((HashTable *) per_dir_conf, \
(apply_func_t) php_apache_alter_ini_entries TSRMLS_CC); }
/* If PHP parser engine has been turned off with an "engine off"
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.123 php4/sapi/cgi/cgi_main.c:1.124
--- php4/sapi/cgi/cgi_main.c:1.123 Mon Jul 30 10:52:16 2001
+++ php4/sapi/cgi/cgi_main.c Tue Jul 31 00:53:53 2001
@@ -82,7 +82,8 @@
#define OPTSTRING "aCc:d:ef:g:hilmnqs?vz:"
-static int _print_module_info ( zend_module_entry *module, void *arg ) {
+static int _print_module_info(zend_module_entry *module, void *arg TSRMLS_DC)
+{
php_printf("%s\n", module->name);
return 0;
}
@@ -135,7 +136,7 @@
}
-static void sapi_cgi_send_header(sapi_header_struct *sapi_header, void \
*server_context) +static void sapi_cgi_send_header(sapi_header_struct *sapi_header, \
void *server_context TSRMLS_DC) {
if (sapi_header) {
PHPWRITE_H(sapi_header->header, sapi_header->header_len);
@@ -344,10 +345,9 @@
}
-static void php_register_command_line_global_vars(char **arg)
+static void php_register_command_line_global_vars(char **arg TSRMLS_DC)
{
char *var, *val;
- TSRMLS_FETCH();
var = *arg;
val = strchr(var, '=');
@@ -585,9 +585,10 @@
SG(headers_sent) = 1;
php_printf("Running PHP %s\n%s\n", PHP_VERSION , get_zend_version());
php_printf("[PHP Modules]\n");
- zend_hash_apply_with_argument(&module_registry, (int (*)(void *, void *)) \
_print_module_info, NULL);
- php_printf("\n[Zend Modules]\n");
- zend_llist_apply_with_argument(&zend_extensions, (void (*)(void *, void *)) \
_print_module_info, NULL); + zend_hash_apply_with_argument(&module_registry, \
(apply_func_arg_t) _print_module_info, NULL TSRMLS_CC); + php_printf("\n[Zend \
Modules]\n"); + /* zend_llist_apply_with_argument(&zend_extensions, \
(llist_apply_with_arg_func_t) _print_module_info, NULL TSRMLS_CC); */ \
+ php_printf("Not Implemented\n"); php_printf("\n");
php_end_ob_buffers(1);
exit(1);
@@ -681,7 +682,7 @@
file_handle.free_filename = 0;
/* This actually destructs the elements of the list - ugly hack */
- zend_llist_apply(&global_vars, (llist_apply_func_t) \
php_register_command_line_global_vars); + zend_llist_apply(&global_vars, \
(llist_apply_func_t) php_register_command_line_global_vars TSRMLS_CC); \
zend_llist_destroy(&global_vars);
if (!cgi) {
Index: php4/sapi/fastcgi/fastcgi.c
diff -u php4/sapi/fastcgi/fastcgi.c:1.10 php4/sapi/fastcgi/fastcgi.c:1.11
--- php4/sapi/fastcgi/fastcgi.c:1.10 Sat Jul 28 07:36:32 2001
+++ php4/sapi/fastcgi/fastcgi.c Tue Jul 31 00:53:53 2001
@@ -106,7 +106,7 @@
}
-static void sapi_fastcgi_send_header(sapi_header_struct *sapi_header, void \
*server_context) +static void sapi_fastcgi_send_header(sapi_header_struct \
*sapi_header, void *server_context TSRMLS_DC) {
if( sapi_header ) {
#ifdef DEBUG_FASTCGI
Index: php4/sapi/isapi/php4isapi.c
diff -u php4/sapi/isapi/php4isapi.c:1.74 php4/sapi/isapi/php4isapi.c:1.75
--- php4/sapi/isapi/php4isapi.c:1.74 Mon Jul 30 04:24:41 2001
+++ php4/sapi/isapi/php4isapi.c Tue Jul 31 00:53:53 2001
@@ -220,13 +220,13 @@
-static void accumulate_header_length(sapi_header_struct *sapi_header, uint \
*total_length) +static void accumulate_header_length(sapi_header_struct *sapi_header, \
uint *total_length TSRMLS_DC) {
*total_length += sapi_header->header_len+2;
}
-static void concat_header(sapi_header_struct *sapi_header, char \
**combined_headers_ptr) +static void concat_header(sapi_header_struct *sapi_header, \
char **combined_headers_ptr TSRMLS_DC) {
memcpy(*combined_headers_ptr, sapi_header->header, sapi_header->header_len);
*combined_headers_ptr += sapi_header->header_len;
@@ -249,18 +249,18 @@
/* Obtain headers length */
if (SG(sapi_headers).send_default_content_type) {
sapi_get_default_content_type_header(&default_content_type TSRMLS_CC);
- accumulate_header_length(&default_content_type, (void *) &total_length);
+ accumulate_header_length(&default_content_type, (void *) &total_length TSRMLS_CC);
}
- zend_llist_apply_with_argument(&SG(sapi_headers).headers, (void (*)(void *, void \
*)) accumulate_header_length, (void *) &total_length); \
+ zend_llist_apply_with_argument(&SG(sapi_headers).headers, \
(llist_apply_with_arg_func_t) accumulate_header_length, (void *) &total_length \
TSRMLS_CC);
/* Generate headers */
combined_headers = (char *) emalloc(total_length+1);
combined_headers_ptr = combined_headers;
if (SG(sapi_headers).send_default_content_type) {
- concat_header(&default_content_type, (void *) &combined_headers_ptr);
+ concat_header(&default_content_type, (void *) &combined_headers_ptr TSRMLS_CC);
sapi_free_header(&default_content_type); /* we no longer need it */
}
- zend_llist_apply_with_argument(&SG(sapi_headers).headers, (void (*)(void *, void \
*)) concat_header, (void *) &combined_headers_ptr); \
+ zend_llist_apply_with_argument(&SG(sapi_headers).headers, \
(llist_apply_with_arg_func_t) concat_header, (void *) &combined_headers_ptr \
TSRMLS_CC);
*combined_headers_ptr++ = '\r';
*combined_headers_ptr++ = '\n';
*combined_headers_ptr = 0;
Index: php4/sapi/pi3web/pi3web_sapi.c
diff -u php4/sapi/pi3web/pi3web_sapi.c:1.25 php4/sapi/pi3web/pi3web_sapi.c:1.26
--- php4/sapi/pi3web/pi3web_sapi.c:1.25 Mon Jul 30 04:24:41 2001
+++ php4/sapi/pi3web/pi3web_sapi.c Tue Jul 31 00:53:53 2001
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pi3web_sapi.c,v 1.25 2001/07/30 08:24:41 zeev Exp $ */
+/* $Id: pi3web_sapi.c,v 1.26 2001/07/31 04:53:53 zeev Exp $ */
#include "pi3web_sapi.h"
#include "php.h"
@@ -78,7 +78,7 @@
PUTS("<table border=0 cellpadding=3 cellspacing=1 width=600 align=center>\n");
PUTS("<tr><th colspan=2 bgcolor=\"" PHP_HEADER_COLOR "\">Pi3Web Server \
Information</th></tr>\n"); php_info_print_table_header(2, "Information Field", \
"Value");
- php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v \
1.25 2001/07/30 08:24:41 zeev Exp $"); + php_info_print_table_row(2, "Pi3Web SAPI \
module version", "$Id: pi3web_sapi.c,v 1.26 2001/07/31 04:53:53 zeev Exp $"); \
php_info_print_table_row(2, "Server Name Stamp", HTTPCore_getServerStamp()); \
snprintf(variable_buf, 511, "%d", HTTPCore_debugEnabled()); \
php_info_print_table_row(2, "Debug Enabled", variable_buf); @@ -157,13 +157,13 @@
-static void accumulate_header_length(sapi_header_struct *sapi_header, uint \
*total_length) +static void accumulate_header_length(sapi_header_struct *sapi_header, \
uint *total_length TSRMLS_DC) {
*total_length += sapi_header->header_len+2;
}
-static void concat_header(sapi_header_struct *sapi_header, char \
**combined_headers_ptr) +static void concat_header(sapi_header_struct *sapi_header, \
char **combined_headers_ptr TSRMLS_DC) {
memcpy(*combined_headers_ptr, sapi_header->header, sapi_header->header_len);
*combined_headers_ptr += sapi_header->header_len;
@@ -187,9 +187,9 @@
if (SG(sapi_headers).send_default_content_type) {
sapi_get_default_content_type_header(&default_content_type TSRMLS_CC);
- accumulate_header_length(&default_content_type, (void *) &total_length);
+ accumulate_header_length(&default_content_type, (void *) &total_length TSRMLS_CC);
}
- zend_llist_apply_with_argument(&SG(sapi_headers).headers, (void (*)(void *, void \
*)) accumulate_header_length, (void *) &total_length); \
+ zend_llist_apply_with_argument(&SG(sapi_headers).headers, \
(llist_apply_with_arg_func_t) accumulate_header_length, (void *) &total_length \
TSRMLS_CC);
/* Generate headers */
combined_headers = (char *) emalloc(total_length+1);
@@ -198,7 +198,7 @@
concat_header(&default_content_type, (void *) &combined_headers_ptr);
sapi_free_header(&default_content_type); /* we no longer need it */
}
- zend_llist_apply_with_argument(&SG(sapi_headers).headers, (void (*)(void *, void \
*)) concat_header, (void *) &combined_headers_ptr); \
+ zend_llist_apply_with_argument(&SG(sapi_headers).headers, \
(llist_apply_with_arg_func_t) concat_header, (void *) &combined_headers_ptr \
TSRMLS_CC);
*combined_headers_ptr++ = '\r';
*combined_headers_ptr++ = '\n';
*combined_headers_ptr = 0;
Index: php4/sapi/servlet/servlet.c
diff -u php4/sapi/servlet/servlet.c:1.52 php4/sapi/servlet/servlet.c:1.53
--- php4/sapi/servlet/servlet.c:1.52 Mon Jul 30 04:24:42 2001
+++ php4/sapi/servlet/servlet.c Tue Jul 31 00:53:54 2001
@@ -142,9 +142,8 @@
}
-static void sapi_servlet_send_header(sapi_header_struct *sapi_header, void \
*server_context) +static void sapi_servlet_send_header(sapi_header_struct \
*sapi_header, void *server_context TSRMLS_DC) {
- TSRMLS_FETCH();
if (!sapi_header) return;
if (!SG(server_context)) return;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: php-cvs-unsubscribe@lists.php.net
For additional commands, e-mail: php-cvs-help@lists.php.net
To contact the list administrators, e-mail: php-list-admin@lists.php.net
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic