X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Fset_func.c;h=826fc6a0ca090a7140bdfaf28ad810c4ee1f53fc;hb=698841dfdd4d70d24e0b7af25ac7100bc2cb26a4;hp=7ac2ed581627982e50868a29d1e6f67451c7ce6b;hpb=2fa436074ca9a5e87f39b696de832fa2188fcfc6;p=m6w6%2Fext-psi

diff --git a/src/types/set_func.c b/src/types/set_func.c
index 7ac2ed5..826fc6a 100644
--- a/src/types/set_func.c
+++ b/src/types/set_func.c
@@ -23,13 +23,17 @@
  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"
 
 struct psi_set_func *psi_set_func_init(token_t type, zend_string *name,
 		struct psi_decl_var *var)
 {
-	struct psi_set_func *func = calloc(1, sizeof(*func));
+	struct psi_set_func *func = pecalloc(1, sizeof(*func), 1);
 
 	func->type = type;
 	func->name = zend_string_copy(name);
@@ -51,30 +55,30 @@ void psi_set_func_free(struct psi_set_func **func_ptr)
 	}
 }
 
-void psi_set_func_dump(int fd, struct psi_set_func *func, unsigned level)
+void psi_set_func_dump(struct psi_dump *dump, struct psi_set_func *func, unsigned level)
 {
-	dprintf(fd, "%s(", func->name->val);
-	psi_decl_var_dump(fd, func->var);
-	dprintf(fd, "\t/* fqn=%s */", func->var->fqn->val);
+	PSI_DUMP(dump, "%s(", func->name->val);
+	psi_decl_var_dump(dump, func->var);
+	PSI_DUMP(dump, "\t/* fqn=%s */", func->var->fqn->val);
 	if (func->inner && !func->recursive) {
 		size_t i = 0, count = psi_plist_count(func->inner);
 		struct psi_set_exp *inner;
 
-		dprintf(fd, ",");
+		PSI_DUMP(dump, ",");
 		++level;
 		while (psi_plist_get(func->inner, i++, &inner)) {
-			dprintf(fd, "\n");
-			psi_set_exp_dump(fd, inner, level, i == count);
+			PSI_DUMP(dump, "\n");
+			psi_set_exp_dump(dump, inner, level, i == count);
 		}
 		--level;
 	}
 	if (func->recursive) {
-		dprintf(fd, ", ...");
+		PSI_DUMP(dump, ", ...");
 	}
 	if (func->inner && !func->recursive) {
-		dprintf(fd, "\n%s", psi_t_indent(level));
+		PSI_DUMP(dump, "\n%s", psi_t_indent(level));
 	}
-	dprintf(fd, ")");
+	PSI_DUMP(dump, ")");
 }
 
 static inline bool psi_set_func_validate_to_string(struct psi_data *data,