CVS update: php3/functions
| From: | ssb | Date: | Fri, 04 Dec 1998 16:37:01 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-2659@lists.php.net to get a copy of this message | ||
Date: Friday December 4, 1998 @ 11:37
Author: ssb
Update of /repository/php3/functions
In directory asf:/u/temp/cvs-serv23186
Modified Files:
xml.c
Log Message:
removed some internal functions now found in variables.c
fixed a possible memory leak
Index: php3/functions/xml.c
diff -c php3/functions/xml.c:1.14 php3/functions/xml.c:1.15
*** php3/functions/xml.c:1.14 Wed Oct 28 00:27:47 1998
--- php3/functions/xml.c Fri Dec 4 11:37:01 1998
***************
*** 27,33 ****
+----------------------------------------------------------------------+
*/
! /* $Id: xml.c,v 1.14 1998/10/28 05:27:47 ssb Exp $ */
#define IS_EXT_MODULE
#if COMPILE_DL
# if PHP_31
--- 27,33 ----
+----------------------------------------------------------------------+
*/
! /* $Id: xml.c,v 1.15 1998/12/04 16:37:01 ssb Exp $ */
#define IS_EXT_MODULE
#if COMPILE_DL
# if PHP_31
***************
*** 107,113 ****
void php3_info_xml(void);
static xml_parser *xml_get_parser(int, const char *, HashTable *);
- static char *php3i_pvalstrcpy(pval *);
static void xml_destroy_parser(xml_parser *);
static void xml_set_handler(char **, pval *);
inline static unsigned short xml_encode_iso_8859_1(unsigned char);
--- 107,112 ----
***************
*** 117,124 ****
static XML_Char *xml_utf8_encode(const char *, int, int *, const XML_Char *);
static char *xml_utf8_decode(const XML_Char *, int, int *, const XML_Char *);
static pval *xml_call_handler(xml_parser *, char *, int, pval **);
- static pval *php3i_longpval(long);
- static pval *php3i_stringpval(const char *);
static pval *php3i_xmlcharpval(const XML_Char *, int, const XML_Char *);
static int php3i_xmlcharlen(const XML_Char *);
--- 116,121 ----
***************
*** 356,362 ****
xml_set_handler(char **nameBufp, pval *data)
{
if (data->value.str.len > 0) {
! *nameBufp = php3i_pvalstrcpy(data);
} else {
if (*nameBufp != NULL) {
efree(*nameBufp);
--- 353,362 ----
xml_set_handler(char **nameBufp, pval *data)
{
if (data->value.str.len > 0) {
! if (*nameBufp != NULL) {
! efree(*nameBufp);
! }
! *nameBufp = php3i_pval_strdup(data);
} else {
if (*nameBufp != NULL) {
efree(*nameBufp);
***************
*** 376,382 ****
int i;
HashTable *function_table;
! func = php3i_stringpval(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.
--- 376,382 ----
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.
***************
*** 556,587 ****
return newbuf;
}
/* }}} */
- /* {{{ php3i_longpval() */
-
- static pval *php3i_longpval(long value)
- {
- pval *ret = emalloc(sizeof(pval));
-
- ret->type = IS_LONG;
- ret->value.lval = value;
- return ret;
- }
-
- /* }}} */
- /* {{{ php3i_stringpval() */
-
- static pval *php3i_stringpval(const char *str)
- {
- pval *ret = emalloc(sizeof(pval));
- int len = strlen(str);
-
- ret->type = IS_STRING;
- ret->value.str.len = len;
- ret->value.str.val = estrndup(str, len);
- return ret;
- }
-
- /* }}} */
/* {{{ php3i_xmlcharpval() */
static pval *php3i_xmlcharpval(const XML_Char *s, int len, const XML_Char *encoding)
--- 556,561 ----
***************
*** 615,633 ****
}
/* }}} */
- /* {{{ php3i_pvalstrcpy() */
-
- static char *php3i_pvalstrcpy(pval *val) {
- if (val->type == IS_STRING) {
- char *buf = emalloc(val->value.str.len + 1);
- memcpy(buf, val->value.str.val, val->value.str.len);
- buf[val->value.str.len] = '\0';
- return buf;
- }
- return NULL;
- }
-
- /* }}} */
/* {{{ php3i_xml_startElementHandler() */
void php3i_xml_startElementHandler(void *userData, const char *name,
--- 589,594 ----
***************
*** 642,649 ****
if (parser->case_folding) {
name = _php3_strtoupper(estrdup(name));
}
! args[0] = php3i_longpval(parser->index);
! args[1] = php3i_stringpval(name);
args[2] = emalloc(sizeof(pval));
array_init(args[2]);
while (attributes && *attributes) {
--- 603,610 ----
if (parser->case_folding) {
name = _php3_strtoupper(estrdup(name));
}
! args[0] = php3i_long_pval(parser->index);
! args[1] = php3i_string_pval(name);
args[2] = emalloc(sizeof(pval));
array_init(args[2]);
while (attributes && *attributes) {
***************
*** 682,689 ****
if (parser->case_folding) {
name = _php3_strtoupper(estrdup(name));
}
! args[0] = php3i_longpval(parser->index);
! args[1] = php3i_stringpval(name);
if ((retval = xml_call_handler(parser, parser->endElementHandler, 2, args))) {
php3tls_pval_destructor(retval);
efree(retval);
--- 643,650 ----
if (parser->case_folding) {
name = _php3_strtoupper(estrdup(name));
}
! args[0] = php3i_long_pval(parser->index);
! args[1] = php3i_string_pval(name);
if ((retval = xml_call_handler(parser, parser->endElementHandler, 2, args))) {
php3tls_pval_destructor(retval);
efree(retval);
***************
*** 705,711 ****
if (parser && parser->characterDataHandler) {
pval *retval, *args[2];
! args[0] = php3i_longpval(parser->index);
args[1] = php3i_xmlcharpval(s, len, parser->target_encoding);
if ((retval = xml_call_handler(parser, parser->characterDataHandler, 2, args))) {
php3tls_pval_destructor(retval);
--- 666,672 ----
if (parser && parser->characterDataHandler) {
pval *retval, *args[2];
! args[0] = php3i_long_pval(parser->index);
args[1] = php3i_xmlcharpval(s, len, parser->target_encoding);
if ((retval = xml_call_handler(parser, parser->characterDataHandler, 2, args))) {
php3tls_pval_destructor(retval);
***************
*** 727,733 ****
if (parser && parser->processingInstructionHandler) {
pval *retval, *args[3];
! args[0] = php3i_longpval(parser->index);
args[1] = php3i_xmlcharpval(target, 0, parser->target_encoding);
args[2] = php3i_xmlcharpval(data, 0, parser->target_encoding);
if ((retval = xml_call_handler(parser, parser->processingInstructionHandler, 3, args))) {
--- 688,694 ----
if (parser && parser->processingInstructionHandler) {
pval *retval, *args[3];
! args[0] = php3i_long_pval(parser->index);
args[1] = php3i_xmlcharpval(target, 0, parser->target_encoding);
args[2] = php3i_xmlcharpval(data, 0, parser->target_encoding);
if ((retval = xml_call_handler(parser, parser->processingInstructionHandler, 3, args))) {
***************
*** 748,754 ****
if (parser && parser->defaultHandler) {
pval *retval, *args[2];
! args[0] = php3i_longpval(parser->index);
args[1] = php3i_xmlcharpval(s, len, parser->target_encoding);
if ((retval = xml_call_handler(parser, parser->defaultHandler, 2, args))) {
php3tls_pval_destructor(retval);
--- 709,715 ----
if (parser && parser->defaultHandler) {
pval *retval, *args[2];
! args[0] = php3i_long_pval(parser->index);
args[1] = php3i_xmlcharpval(s, len, parser->target_encoding);
if ((retval = xml_call_handler(parser, parser->defaultHandler, 2, args))) {
php3tls_pval_destructor(retval);
***************
*** 773,779 ****
if (parser && parser->unparsedEntityDeclHandler) {
pval *retval, *args[5];
! args[0] = php3i_longpval(parser->index);
args[1] = php3i_xmlcharpval(entityName, 0, parser->target_encoding);
args[2] = php3i_xmlcharpval(base, 0, parser->target_encoding);
args[3] = php3i_xmlcharpval(systemId, 0, parser->target_encoding);
--- 734,740 ----
if (parser && parser->unparsedEntityDeclHandler) {
pval *retval, *args[5];
! args[0] = php3i_long_pval(parser->index);
args[1] = php3i_xmlcharpval(entityName, 0, parser->target_encoding);
args[2] = php3i_xmlcharpval(base, 0, parser->target_encoding);
args[3] = php3i_xmlcharpval(systemId, 0, parser->target_encoding);
***************
*** 802,808 ****
if (parser && parser->notationDeclHandler) {
pval *retval, *args[5];
! args[0] = php3i_longpval(parser->index);
args[1] = php3i_xmlcharpval(notationName, 0, parser->target_encoding);
args[2] = php3i_xmlcharpval(base, 0, parser->target_encoding);
args[3] = php3i_xmlcharpval(systemId, 0, parser->target_encoding);
--- 763,769 ----
if (parser && parser->notationDeclHandler) {
pval *retval, *args[5];
! args[0] = php3i_long_pval(parser->index);
args[1] = php3i_xmlcharpval(notationName, 0, parser->target_encoding);
args[2] = php3i_xmlcharpval(base, 0, parser->target_encoding);
args[3] = php3i_xmlcharpval(systemId, 0, parser->target_encoding);
***************
*** 831,837 ****
if (parser && parser->externalEntityRefHandler) {
pval *retval, *args[5];
! args[0] = php3i_longpval(parser->index);
args[1] = php3i_xmlcharpval(openEntityNames, 0, parser->target_encoding);
args[2] = php3i_xmlcharpval(base, 0, parser->target_encoding);
args[3] = php3i_xmlcharpval(systemId, 0, parser->target_encoding);
--- 792,798 ----
if (parser && parser->externalEntityRefHandler) {
pval *retval, *args[5];
! args[0] = php3i_long_pval(parser->index);
args[1] = php3i_xmlcharpval(openEntityNames, 0, parser->target_encoding);
args[2] = php3i_xmlcharpval(base, 0, parser->target_encoding);
args[3] = php3i_xmlcharpval(systemId, 0, parser->target_encoding);
***************
*** 1070,1076 ****
}
/* }}} */
! /* {{{ int XML_Parse(int pind, string data[, int isFinal]) */
PHP_FUNCTION(xml_parse)
{
--- 1031,1037 ----
}
/* }}} */
! /* {{{ int xml_parse(int pind, string data[, int isFinal]) */
PHP_FUNCTION(xml_parse)
{
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net