fix gdbinit; postprocessing macros

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

diff --git a/src/types/set_func.c b/src/types/set_func.c
index 7ac2ed581627982e50868a29d1e6f67451c7ce6b..96ab6a19c2da884e17381394badac965366553d4 100644 (file)
--- a/src/types/set_func.c
+++ b/src/types/set_func.c
@@ -29,7 +29,7 @@
 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 +51,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,