X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Fset_exp.c;h=80c166c072f32f50e28230648535ee26708ae9cb;hb=12964ebafbb9090db90faa09fba4140bdffff0eb;hp=ef4173af01e2f8d4084daa3fe321bd36b767095d;hpb=2fa436074ca9a5e87f39b696de832fa2188fcfc6;p=m6w6%2Fext-psi

diff --git a/src/types/set_exp.c b/src/types/set_exp.c
index ef4173a..80c166c 100644
--- a/src/types/set_exp.c
+++ b/src/types/set_exp.c
@@ -33,7 +33,7 @@
 
 struct psi_set_exp *psi_set_exp_init(enum psi_set_exp_kind kind, void *data)
 {
-	struct psi_set_exp *val = calloc(1, sizeof(*val));
+	struct psi_set_exp *val = pecalloc(1, sizeof(*val), 1);
 
 	switch (val->kind = kind) {
 	case PSI_SET_FUNC:
@@ -123,37 +123,37 @@ void psi_set_exp_free(struct psi_set_exp **exp_ptr)
 	}
 }
 
-void psi_set_exp_dump(int fd, struct psi_set_exp *set, unsigned level, int last)
+void psi_set_exp_dump(struct psi_dump *dump, struct psi_set_exp *set, unsigned level, int last)
 {
 	if (level > 1) {
 		/* only if not directly after `set ...` */
-		dprintf(fd, "%s", psi_t_indent(level));
+		PSI_DUMP(dump, "%s", psi_t_indent(level));
 	}
 
 	if (set->var) {
 		/* parsed, or generated */
 		if (set->var->token) {
-			dprintf(fd, "%s = ", set->var->name->val);
+			PSI_DUMP(dump, "%s = ", set->var->name->val);
 		}
 	}
 
 	switch (set->kind) {
 	case PSI_SET_FUNC:
-		psi_set_func_dump(fd, set->data.func, level);
+		psi_set_func_dump(dump, set->data.func, level);
 		break;
 	case PSI_SET_NUMEXP:
-		psi_num_exp_dump(fd, set->data.num);
+		psi_num_exp_dump(dump, set->data.num);
 		break;
 	default:
 		assert(0);
 	}
 
 	if (!last) {
-		dprintf(fd, ",");
+		PSI_DUMP(dump, ",");
 	}
 
 	if (set->var) {
-		dprintf(fd, "\t/* fqn=%s */", set->var->fqn->val);
+		PSI_DUMP(dump, "\t/* fqn=%s */", set->var->fqn->val);
 	}
 }