[PHP4BETA] CVS update: php4/ext/xml
| From: | sas | Date: | Thu, 27 May 1999 01:34:18 +0000 |
| Subject: | [PHP4BETA] CVS update: php4/ext/xml | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-1112@lists.php.net to get a copy of this message | ||
Date: Wednesday May 26, 1999 @ 21:34
Author: sas
Update of /repository/php4/ext/xml
In directory php:/tmp/cvs-serv19149/ext/xml
Modified Files:
xml.c
Log Message:
- fix CGI build (at least)
Index: php4/ext/xml/xml.c
diff -u php4/ext/xml/xml.c:1.4 php4/ext/xml/xml.c:1.5
--- php4/ext/xml/xml.c:1.4 Sat May 22 12:12:09 1999
+++ php4/ext/xml/xml.c Wed May 26 21:34:18 1999
@@ -27,7 +27,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xml.c,v 1.4 1999/05/22 16:12:09 sas Exp $ */
+/* $Id: xml.c,v 1.5 1999/05/27 01:34:18 sas Exp $ */
#define IS_EXT_MODULE
#if COMPILE_DL
# if PHP_31
@@ -363,7 +363,8 @@
if (*nameBufp != NULL) {
efree(*nameBufp);
}
- *nameBufp = php3i_pval_strdup(data);
+ convert_to_string(data);
+ *nameBufp = estrndup(data->value.str.val, data->value.str.len);
} else {
if (*nameBufp != NULL) {
efree(*nameBufp);
@@ -378,18 +379,18 @@
static pval *
xml_call_handler(xml_parser *parser, char *funcName, int argc, pval **argv)
{
+ ELS_FETCH();
+
if (parser && funcName) {
pval *retval, *func;
int i;
- HashTable *function_table;
func = php3i_string_pval(funcName);
retval = emalloc(sizeof(pval));
/* We cannot call internal variables from a function module as
it breaks any chance of compiling it as a module on windows.
Instead, we create a callback function. */
- function_table=php3i_get_function_table();
- if (call_user_function(function_table, NULL, func, retval, argc, argv) == FAILURE) {
+ if (call_user_function(EG(function_table), NULL, func, retval, argc, argv) == FAILURE) {
php3tls_pval_destructor(retval);
efree(retval);
return NULL;
--
PHP 4 Beta