Use MAKE_STD_ZVAL instead of ALLOC_ZVAL

diff --git a/ext/yaz/php_yaz.c b/ext/yaz/php_yaz.c
index 84972838468b072f9b5f7b37ece9d06acbccd327..45db659290b9747e43e23e779ad8bb6d91630561 100644 (file)
--- a/ext/yaz/php_yaz.c
+++ b/ext/yaz/php_yaz.c
@@ -868,9 +868,8 @@ static void retval_array2_grs1(zval *return_value, Z_GenericRecord *p)
                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 @@ static void retval_array2_grs1(zval *return_value, Z_GenericRecord *p)
                        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);
                }