X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Fdecl_struct.c;h=d17895a1beece66708fa212e5069140cfa123e91;hb=12964ebafbb9090db90faa09fba4140bdffff0eb;hp=c2b8cc1779806b8582d150dcc30e87d11a2cf1a7;hpb=47dd00ab6df0a093b13d4f573ba01c79a6bcc72f;p=m6w6%2Fext-psi diff --git a/src/types/decl_struct.c b/src/types/decl_struct.c index c2b8cc1..d17895a 100644 --- a/src/types/decl_struct.c +++ b/src/types/decl_struct.c @@ -31,7 +31,7 @@ struct psi_decl_struct* psi_decl_struct_init(zend_string *name, struct psi_plist *args) { - struct psi_decl_struct *s = calloc(1, sizeof(*s)); + struct psi_decl_struct *s = pecalloc(1, sizeof(*s), 1); s->name = zend_string_copy(name); s->args = args; return s; @@ -55,14 +55,14 @@ void psi_decl_struct_free(struct psi_decl_struct **s_ptr) } } -void psi_decl_struct_dump(int fd, struct psi_decl_struct *strct) +void psi_decl_struct_dump(struct psi_dump *dump, struct psi_decl_struct *strct) { - dprintf(fd, "struct %s::(%zu, %zu)", strct->name->val, strct->align, + PSI_DUMP(dump, "struct %s::(%zu, %zu)", strct->name->val, strct->align, strct->size); if (psi_plist_count(strct->args)) { - psi_decl_type_dump_args_with_layout(fd, strct->args, 0); + psi_decl_type_dump_args_with_layout(dump, strct->args, 0); } else { - dprintf(fd, ";"); + PSI_DUMP(dump, ";"); } }