X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Fdecl_enum_item.c;h=4992000f67e27e4d9e82a43a0d47e532fb001e3a;hb=788909f4828147d22a822b736560c1b3643417ec;hp=7410e01d7621b3b319b15a6582d59bb895db9bef;hpb=c9384515a81cb64d345b299908b2852f51bb8e6e;p=m6w6%2Fext-psi

diff --git a/src/types/decl_enum_item.c b/src/types/decl_enum_item.c
index 7410e01..4992000 100644
--- a/src/types/decl_enum_item.c
+++ b/src/types/decl_enum_item.c
@@ -26,11 +26,11 @@
 #include "php_psi_stdinc.h"
 #include "data.h"
 
-struct psi_decl_enum_item *psi_decl_enum_item_init(const char *name,
+struct psi_decl_enum_item *psi_decl_enum_item_init(zend_string *name,
 		struct psi_num_exp *num)
 {
-	struct psi_decl_enum_item *i = calloc(1, sizeof(*i));
-	i->name = strdup(name);
+	struct psi_decl_enum_item *i = pecalloc(1, sizeof(*i), 1);
+	i->name = zend_string_copy(name);
 	i->num = num;
 	return i;
 }
@@ -41,9 +41,7 @@ void psi_decl_enum_item_free(struct psi_decl_enum_item **i_ptr)
 		struct psi_decl_enum_item *i = *i_ptr;
 
 		*i_ptr = NULL;
-		if (i->token) {
-			free(i->token);
-		}
+		psi_token_free(&i->token);
 		if (i->num) {
 			if (i->num == &i->inc) {
 				switch (i->inc.op) {
@@ -61,17 +59,17 @@ void psi_decl_enum_item_free(struct psi_decl_enum_item **i_ptr)
 				psi_num_exp_free(&i->num);
 			}
 		}
-		free(i->name);
+		zend_string_release(i->name);
 		free(i);
 	}
 }
 
-void psi_decl_enum_item_dump(int fd, struct psi_decl_enum_item *item)
+void psi_decl_enum_item_dump(struct psi_dump *dump, struct psi_decl_enum_item *item)
 {
-	dprintf(fd, "%s", item->name);
+	PSI_DUMP(dump, "%s", item->name->val);
 	if (item->num && item->num != &item->inc) {
-		dprintf(fd, " = ");
-		psi_num_exp_dump(fd, item->num);
+		PSI_DUMP(dump, " = ");
+		psi_num_exp_dump(dump, item->num);
 	}
 }