pe*alloc

[m6w6/ext-psi] / src / types / impl_type.c

diff --git a/src/types/impl_type.c b/src/types/impl_type.c
index 25b1f1f5f254ae302b0260305cd9846adcff865f..be173aa9b1b646a437f0de820621c75b5cca5d95 100644 (file)
--- a/src/types/impl_type.c
+++ b/src/types/impl_type.c
@@ -26,19 +26,19 @@
 #include "php_psi_stdinc.h"
 #include "data.h"
 
-struct psi_impl_type *psi_impl_type_init(token_t type, const char *name)
+struct psi_impl_type *psi_impl_type_init(token_t type, zend_string *name)
 {
-       struct psi_impl_type *t = calloc(1, sizeof(*t));
+       struct psi_impl_type *t = pecalloc(1, sizeof(*t), 1);
 
        t->type = type;
-       t->name = strdup(name);
+       t->name = zend_string_copy(name);
 
        return t;
 }
 
 void psi_impl_type_dump(int fd, struct psi_impl_type *type)
 {
-       dprintf(fd, "%s", type->name);
+       dprintf(fd, "%s", type->name->val);
 }
 
 void psi_impl_type_free(struct psi_impl_type **type_ptr)
@@ -47,10 +47,8 @@ void psi_impl_type_free(struct psi_impl_type **type_ptr)
                struct psi_impl_type *type = *type_ptr;
 
                *type_ptr = NULL;
-               if (type->token) {
-                       free(type->token);
-               }
-               free(type->name);
+               psi_token_free(&type->token);
+               zend_string_release(type->name);
                free(type);
        }
 }