X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Flet_callback.c;h=abe21411b0abb71f9e04fc62da799af441255aa7;hb=f76cbab7698c988217d56a96f3ef68005cddd5ec;hp=7126b12e23a8f3d43d7cebd159f134361023eb81;hpb=2fa436074ca9a5e87f39b696de832fa2188fcfc6;p=m6w6%2Fext-psi

diff --git a/src/types/let_callback.c b/src/types/let_callback.c
index 7126b12..abe2141 100644
--- a/src/types/let_callback.c
+++ b/src/types/let_callback.c
@@ -29,7 +29,7 @@
 struct psi_let_callback *psi_let_callback_init(struct psi_let_func *func,
 		struct psi_plist *args, struct psi_plist *cb_args)
 {
-	struct psi_let_callback *cb = calloc(1, sizeof(*cb));
+	struct psi_let_callback *cb = pecalloc(1, sizeof(*cb), 1);
 	cb->func = func;
 	cb->args = args;
 	cb->cb_args = cb_args;
@@ -125,22 +125,22 @@ bool psi_let_callback_validate(struct psi_data *data, struct psi_let_callback *c
 	return true;
 }
 
-void psi_let_callback_dump(int fd, struct psi_let_callback *callback,
+void psi_let_callback_dump(struct psi_dump *dump, struct psi_let_callback *callback,
 		unsigned level)
 {
-	dprintf(fd, "callback(");
+	PSI_DUMP(dump, "callback(");
 	if (callback->cb_args) {
 		size_t i = 0;
 		struct psi_decl_var *cb_arg;
 
 		while (psi_plist_get(callback->cb_args, i++, &cb_arg)) {
 			if (i > 1) {
-				dprintf(fd, ", ");
+				PSI_DUMP(dump, ", ");
 			}
-			psi_decl_var_dump(fd, cb_arg);
+			psi_decl_var_dump(dump, cb_arg);
 		}
 	}
-	dprintf(fd, ") as %s(%s(",
+	PSI_DUMP(dump, ") as %s(%s(",
 			callback->func->name->val,
 			callback->func->var->name->val);
 
@@ -148,14 +148,14 @@ void psi_let_callback_dump(int fd, struct psi_let_callback *callback,
 		size_t i = 0, last = psi_plist_count(callback->args);
 		struct psi_set_exp *set;
 
-		dprintf(fd, "\n");
+		PSI_DUMP(dump, "\n");
 		++level;
 		while (psi_plist_get(callback->args, i++, &set)) {
-			psi_set_exp_dump(fd, set, level, i == last);
-			dprintf(fd, "\n");
+			psi_set_exp_dump(dump, set, level, i == last);
+			PSI_DUMP(dump, "\n");
 		}
 		--level;
-		dprintf(fd, "%s", psi_t_indent(level));
+		PSI_DUMP(dump, "%s", psi_t_indent(level));
 	}
-	dprintf(fd, "))");
+	PSI_DUMP(dump, "))");
 }