[PHP-CVS] cvs: php-src /ext/yaz php_yaz.c

[Adam Dickmeiss]

dickmeiss               Mon Mar 15 05:01:11 2004 EDT

  Modified files:              
    /php-src/ext/yaz    php_yaz.c 
  Log:
  Use MAKE_STD_ZVAL instead of ALLOC_ZVAL
  
http://cvs.php.net/diff.php/php-src/ext/yaz/php_yaz.c?r1=1.84&r2=1.85&ty=u
Index: php-src/ext/yaz/php_yaz.c
diff -u php-src/ext/yaz/php_yaz.c:1.84 php-src/ext/yaz/php_yaz.c:1.85
--- php-src/ext/yaz/php_yaz.c:1.84      Mon Feb 23 05:48:44 2004
+++ php-src/ext/yaz/php_yaz.c   Mon Mar 15 05:01:09 2004
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_yaz.c,v 1.84 2004/02/23 10:48:44 dickmeiss Exp $ */
+/* $Id: php_yaz.c,v 1.85 2004/03/15 10:01:09 dickmeiss Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -868,9 +868,8 @@
                zval *zval_sub;
                Z_TaggedElement *e = p->elements[i];
                
-               ALLOC_ZVAL(zval_element);
+               MAKE_STD_ZVAL(zval_element);
                array_init(zval_element);
-               INIT_PZVAL(zval_element);
                
                if (e->tagType)
                        add_assoc_long(zval_element, "tagType", *e->tagType);
@@ -891,7 +890,7 @@
                        add_assoc_bool(zval_element, 
"content",*e->content->u.trueOrFalse);
                        break;
                case Z_ElementData_subtree:
-                       ALLOC_ZVAL(zval_sub);
+                       MAKE_STD_ZVAL(zval_sub);
                        retval_array2_grs1(zval_sub, e->content->u.subtree);
                        add_assoc_zval(zval_element, "content", zval_sub);
                }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php