X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Fimpl_func.c;h=a6f45e6943d1d9ccfc32dd8453e75c7c6f915ef4;hb=35060621f2fd5079502543d17942127c1a602f72;hp=5893b4fd3fb22794eb3f8383e9ec05971360bdb4;hpb=c9384515a81cb64d345b299908b2852f51bb8e6e;p=m6w6%2Fext-psi

diff --git a/src/types/impl_func.c b/src/types/impl_func.c
index 5893b4f..a6f45e6 100644
--- a/src/types/impl_func.c
+++ b/src/types/impl_func.c
@@ -26,12 +26,12 @@
 #include "php_psi_stdinc.h"
 #include "data.h"
 
-struct psi_impl_func *psi_impl_func_init(const char *name,
+struct psi_impl_func *psi_impl_func_init(zend_string *name,
 		struct psi_plist *args, struct psi_impl_type *type)
 {
-	struct psi_impl_func *func = calloc(1, sizeof(*func));
+	struct psi_impl_func *func = pecalloc(1, sizeof(*func), 1);
 
-	func->name = strdup(name);
+	func->name = zend_string_copy(name);
 	func->args = args ? : psi_plist_init((psi_plist_dtor) psi_impl_arg_free);
 
 	func->return_type = type;
@@ -45,9 +45,7 @@ void psi_impl_func_free(struct psi_impl_func **f_ptr)
 		struct psi_impl_func *f = *f_ptr;
 
 		*f_ptr = NULL;
-		if (f->token) {
-			free(f->token);
-		}
+		psi_token_free(&f->token);
 
 		psi_impl_type_free(&f->return_type);
 		psi_plist_free(f->args);
@@ -56,7 +54,7 @@ void psi_impl_func_free(struct psi_impl_func **f_ptr)
 			psi_impl_arg_free(&f->vararg);
 		}
 
-		free(f->name);
+		zend_string_release(f->name);
 		free(f);
 	}
 }
@@ -79,7 +77,7 @@ bool psi_impl_func_validate(struct psi_data *data, struct psi_impl_func *func,
 					"Non-optional argument %zu '$%s' of implementation '%s'"
 					" follows optional argument",
 					i + 1,
-					iarg->var->name, func->name);
+					iarg->var->name->val, func->name->val);
 			return false;
 		}
 	}
@@ -89,7 +87,7 @@ bool psi_impl_func_validate(struct psi_data *data, struct psi_impl_func *func,
 
 void psi_impl_func_dump(int fd, struct psi_impl_func *func)
 {
-	dprintf(fd, "function %s(", func->name);
+	dprintf(fd, "function %s(", func->name->val);
 	if (func->args) {
 		size_t i = 0;
 		struct psi_impl_arg *iarg;
@@ -107,5 +105,5 @@ void psi_impl_func_dump(int fd, struct psi_impl_func *func)
 		}
 	}
 	dprintf(fd, ") : %s%s", func->return_reference ? "&" : "",
-			func->return_type->name);
+			func->return_type->name->val);
 }