cvs: /php4/ext/odbc php_odbc.c /php4/ext/xml xml.c /php4/tests testfunc

andi Sat Feb 5 09:58:42 2000 EDT Modified files: /php4/ext/odbc php_odbc.c /php4/ext/xml xml.c /php4/tests testfunc Log: - Make Win32 compile again Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.27 php4/ext/odbc/php_odbc.c:1.28 --- php4/ext/odbc/php_odbc.c:1.27 Sun Jan 16 13:03:48 2000 +++ php4/ext/odbc/php_odbc.c Sat Feb 5 09:58:11 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.27 2000/01/16 21:03:48 zeev Exp $ */ +/* $Id: php_odbc.c,v 1.28 2000/02/05 17:58:11 andi Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" @@ -314,7 +314,6 @@ PHP_MINIT_FUNCTION(odbc) { - ELS_FETCH(); ODBCLS_D; #ifdef SQLANY_BUG HDBC foobar; @@ -622,7 +621,7 @@ { void *ptr; int type; - int i, nument = zend_hash_next_free_element(list); + int i, nument = zend_hash_next_free_element(&EG(regular_list)); for(i = 1; i < nument; i++) { ptr = zend_list_find(i, &type); @@ -1757,7 +1756,7 @@ if (persistent) { list_entry *le; - if (zend_hash_find(plist, hashed_details, hashed_len + 1, (void **) &le) + if (zend_hash_find(&EG(persistent_list), hashed_details, hashed_len + 1, (void **) &le) == FAILURE) { /* the link is not in the persistent list */ list_entry new_le; @@ -1779,7 +1778,7 @@ new_le.type = le_pconn; new_le.ptr = db_conn; - if (zend_hash_update(plist, hashed_details, hashed_len + 1, &new_le, + if (zend_hash_update(&EG(persistent_list), hashed_details, hashed_len + 1, &new_le, sizeof(list_entry), NULL) == FAILURE) { free(db_conn); efree(hashed_details); @@ -1809,7 +1808,7 @@ d_name, sizeof(d_name), &len); if(ret != SQL_SUCCESS){ - zend_hash_del(plist, hashed_details, hashed_len + 1); + zend_hash_del(&EG(persistent_list), hashed_details, hashed_len + 1); SQLDisconnect(db_conn->hdbc); SQLFreeConnect(db_conn->hdbc); goto try_and_get_another_connection; @@ -1820,7 +1819,7 @@ } else { /* non persistent */ list_entry *index_ptr, new_index_ptr; - if (zend_hash_find(list, hashed_details, hashed_len + 1, + if (zend_hash_find(&EG(regular_list), hashed_details, hashed_len + 1, (void **) &index_ptr) == SUCCESS) { int type, conn_id; void *ptr; @@ -1836,7 +1835,7 @@ efree(hashed_details); return; } else { - zend_hash_del(list, hashed_details, hashed_len + 1); + zend_hash_del(&EG(regular_list), hashed_details, hashed_len + 1); } } if (ODBCG(max_links) != -1 && ODBCG(num_links) >= ODBCG(max_links)) { @@ -1852,7 +1851,7 @@ ZEND_REGISTER_RESOURCE(return_value, db_conn, le_conn); new_index_ptr.ptr = (void *) return_value->value.lval; new_index_ptr.type = le_index_ptr; - if (zend_hash_update(list, hashed_details, hashed_len + 1, (void *) &new_index_ptr, + if (zend_hash_update(&EG(regular_list), hashed_details, hashed_len + 1, (void *) &new_index_ptr, sizeof(list_entry), NULL) == FAILURE) { efree(hashed_details); RETURN_FALSE; Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.43 php4/ext/xml/xml.c:1.44 --- php4/ext/xml/xml.c:1.43 Wed Feb 2 10:42:03 2000 +++ php4/ext/xml/xml.c Sat Feb 5 09:58:11 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.43 2000/02/02 18:42:03 zeev Exp $ */ +/* $Id: xml.c,v 1.44 2000/02/05 17:58:11 andi Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -158,9 +158,6 @@ PHP_MINIT_FUNCTION(xml) { - - ELS_FETCH(); - le_xml_parser = register_list_destructors(xml_parser_dtor, NULL); #ifdef ZTS Index: php4/tests/testfunc diff -u php4/tests/testfunc:1.11 php4/tests/testfunc:1.12 --- php4/tests/testfunc:1.11 Thu Oct 7 07:32:07 1999 +++ php4/tests/testfunc Sat Feb 5 09:58:11 2000 @@ -15,7 +15,7 @@ foo(); } -for ($i=0; $i<1000; $i++) { +for ($i=0; $i<10; $i++) { bar(); }