X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Fdecl_var.c;h=86aa33be32bf8b726e138cc1ed371d3f18a48db2;hb=698841dfdd4d70d24e0b7af25ac7100bc2cb26a4;hp=56c525cb5241fc96dd97ce6b13f34f7a167acfb6;hpb=2fa436074ca9a5e87f39b696de832fa2188fcfc6;p=m6w6%2Fext-psi

diff --git a/src/types/decl_var.c b/src/types/decl_var.c
index 56c525c..86aa33b 100644
--- a/src/types/decl_var.c
+++ b/src/types/decl_var.c
@@ -23,7 +23,11 @@
  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 <assert.h>
@@ -33,7 +37,7 @@
 struct psi_decl_var *psi_decl_var_init(zend_string *name, unsigned pl,
 		unsigned as)
 {
-	struct psi_decl_var *v = calloc(1, sizeof(*v));
+	struct psi_decl_var *v = pecalloc(1, sizeof(*v), 1);
 	if (name) {
 		v->name = zend_string_copy(name);
 		v->fqn = zend_string_copy(name);
@@ -45,7 +49,7 @@ struct psi_decl_var *psi_decl_var_init(zend_string *name, unsigned pl,
 
 struct psi_decl_var *psi_decl_var_copy(struct psi_decl_var *src)
 {
-	struct psi_decl_var *dest = calloc(1, sizeof(*dest));
+	struct psi_decl_var *dest = pecalloc(1, sizeof(*dest), 1);
 
 	*dest = *src;
 
@@ -75,13 +79,13 @@ void psi_decl_var_free(struct psi_decl_var **var_ptr)
 	}
 }
 
-void psi_decl_var_dump(int fd, struct psi_decl_var *var)
+void psi_decl_var_dump(struct psi_dump *dump, struct psi_decl_var *var)
 {
-	dprintf(fd, "%s%s",
+	PSI_DUMP(dump, "%s%s",
 			psi_t_indirection(var->pointer_level - !!var->array_size),
 			var->name ? var->name->val : "/**/");
 	if (var->array_size && var->arg->type->type != PSI_T_FUNCTION) {
-		dprintf(fd, "[%u]", var->array_size);
+		PSI_DUMP(dump, "[%u]", var->array_size);
 	}
 }