X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Fimpl_var.c;h=edf31bf78871987361c497b6f3160779777e785d;hb=698841dfdd4d70d24e0b7af25ac7100bc2cb26a4;hp=1fa41734d87c5c9bd22c038df2e226f7e99425b2;hpb=2fa436074ca9a5e87f39b696de832fa2188fcfc6;p=m6w6%2Fext-psi

diff --git a/src/types/impl_var.c b/src/types/impl_var.c
index 1fa4173..edf31bf 100644
--- a/src/types/impl_var.c
+++ b/src/types/impl_var.c
@@ -23,14 +23,18 @@
  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 <Zend/zend_smart_str.h>
 
 struct psi_impl_var *psi_impl_var_init(zend_string *name, bool is_reference)
 {
-	struct psi_impl_var *var = calloc(1, sizeof(*var));
+	struct psi_impl_var *var = pecalloc(1, sizeof(*var), 1);
 
 	var->name = zend_string_copy(name);
 	var->fqn = zend_string_copy(name);
@@ -41,7 +45,7 @@ struct psi_impl_var *psi_impl_var_init(zend_string *name, bool is_reference)
 
 struct psi_impl_var *psi_impl_var_copy(struct psi_impl_var *var)
 {
-	struct psi_impl_var *cpy = malloc(sizeof(*cpy));
+	struct psi_impl_var *cpy = pemalloc(sizeof(*cpy), 1);
 
 	*cpy = *var;
 
@@ -67,9 +71,9 @@ void psi_impl_var_free(struct psi_impl_var **var_ptr)
 	}
 }
 
-void psi_impl_var_dump(int fd, struct psi_impl_var *var, bool vararg)
+void psi_impl_var_dump(struct psi_dump *dump, struct psi_impl_var *var, bool vararg)
 {
-	dprintf(fd, "%s%s%s",
+	PSI_DUMP(dump, "%s%s%s",
 		var->reference ? "&" : "",
 		vararg ? "..." : "",
 		var->name->val);