X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes%2Fdecl_enum.c;h=310b7e3bc32557b8aa45660021fac23586f10aff;hp=026c375c4223f6661a4f56e4ad155d6265022308;hb=216e7ac3b97aed5a5d65c511dc061c78be90e79d;hpb=ddeb4918bce67ed63c5f4c8c4e250e92ebdef89d

diff --git a/src/types/decl_enum.c b/src/types/decl_enum.c
index 026c375..310b7e3 100644
--- a/src/types/decl_enum.c
+++ b/src/types/decl_enum.c
@@ -26,10 +26,10 @@
 #include "php_psi_stdinc.h"
 #include "data.h"
 
-struct psi_decl_enum *psi_decl_enum_init(const char *name, struct psi_plist *l)
+struct psi_decl_enum *psi_decl_enum_init(zend_string *name, struct psi_plist *l)
 {
-	struct psi_decl_enum *e = calloc(1, sizeof(*e));
-	e->name = strdup(name);
+	struct psi_decl_enum *e = pecalloc(1, sizeof(*e), 1);
+	e->name = zend_string_copy(name);
 	e->items = l;
 	return e;
 }
@@ -40,20 +40,18 @@ void psi_decl_enum_free(struct psi_decl_enum **e_ptr)
 		struct psi_decl_enum *e = *e_ptr;
 
 		*e_ptr = NULL;
-		if (e->token) {
-			free(e->token);
-		}
+		psi_token_free(&e->token);
 		if (e->items) {
 			psi_plist_free(e->items);
 		}
-		free(e->name);
+		zend_string_release(e->name);
 		free(e);
 	}
 }
 
 void psi_decl_enum_dump(int fd, struct psi_decl_enum *e, unsigned level)
 {
-	dprintf(fd, "enum %s {\n", e->name);
+	dprintf(fd, "enum %s {\n", e->name->val);
 	if (e->items) {
 		size_t i = 0;
 		struct psi_decl_enum_item *item;
@@ -75,7 +73,7 @@ bool psi_decl_enum_validate(struct psi_data *data, struct psi_decl_enum *e)
 	struct psi_decl_enum_item *i, *p = NULL;
 
 	if (!psi_plist_count(e->items)) {
-		data->error(data, e->token, PSI_WARNING, "Empty enum '%s'", e->name);
+		data->error(data, e->token, PSI_WARNING, "Empty enum '%s'", e->name->val);
 		return false;
 	}