X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Fdecl_union.c;h=2c0b73db2505eb91f1643ad5515ad8a1195680c8;hb=d601b72f4ea4141809f229cebfaa517288cb4159;hp=826dc480a1c62379a1d3f78cc06e0d84d8d43f03;hpb=2fa436074ca9a5e87f39b696de832fa2188fcfc6;p=m6w6%2Fext-psi

diff --git a/src/types/decl_union.c b/src/types/decl_union.c
index 826dc48..2c0b73d 100644
--- a/src/types/decl_union.c
+++ b/src/types/decl_union.c
@@ -23,7 +23,11 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *******************************************************************************/
 
-#include "php_psi_stdinc.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
 #include "data.h"
 
 #include <assert.h>
@@ -31,7 +35,7 @@
 struct psi_decl_union* psi_decl_union_init(zend_string *name,
 		struct psi_plist *args)
 {
-	struct psi_decl_union *u = calloc(1, sizeof(*u));
+	struct psi_decl_union *u = pecalloc(1, sizeof(*u), 1);
 	u->name = zend_string_copy(name);
 	u->args = args;
 	return u;
@@ -52,13 +56,13 @@ void psi_decl_union_free(struct psi_decl_union **u_ptr)
 	}
 }
 
-void psi_decl_union_dump(int fd, struct psi_decl_union *unn)
+void psi_decl_union_dump(struct psi_dump *dump, struct psi_decl_union *unn)
 {
-	dprintf(fd, "union %s::(%zu, %zu)", unn->name->val, unn->align, unn->size);
+	PSI_DUMP(dump, "union %s::(%zu, %zu)", unn->name->val, unn->align, unn->size);
 	if (psi_plist_count(unn->args)) {
-		psi_decl_type_dump_args_with_layout(fd, unn->args, 0);
+		psi_decl_type_dump_args_with_layout(dump, unn->args, 0);
 	} else {
-		dprintf(fd, ";");
+		PSI_DUMP(dump, ";");
 	}
 }