X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Fimpl_func.c;h=a701134e4a54ea9bc34abdcf4147a83e9f649d24;hb=4bf8ff5e477da2fa4f82518bb947055c2c0374d6;hp=d1604482053fede9537f9cfef72141fa5c51d410;hpb=2fa436074ca9a5e87f39b696de832fa2188fcfc6;p=m6w6%2Fext-psi

diff --git a/src/types/impl_func.c b/src/types/impl_func.c
index d160448..a701134 100644
--- a/src/types/impl_func.c
+++ b/src/types/impl_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_impl_func *psi_impl_func_init(zend_string *name,
 		struct psi_plist *args, struct psi_impl_type *type)
 {
-	struct psi_impl_func *func = calloc(1, sizeof(*func));
+	struct psi_impl_func *func = pecalloc(1, sizeof(*func), 1);
 
 	func->name = zend_string_copy(name);
 	func->args = args ? : psi_plist_init((psi_plist_dtor) psi_impl_arg_free);
@@ -85,25 +89,25 @@ bool psi_impl_func_validate(struct psi_data *data, struct psi_impl_func *func,
 	return true;
 }
 
-void psi_impl_func_dump(int fd, struct psi_impl_func *func)
+void psi_impl_func_dump(struct psi_dump *dump, struct psi_impl_func *func)
 {
-	dprintf(fd, "function %s(", func->name->val);
+	PSI_DUMP(dump, "function %s(", func->name->val);
 	if (func->args) {
 		size_t i = 0;
 		struct psi_impl_arg *iarg;
 
 		while (psi_plist_get(func->args, i++, &iarg)) {
 			if (i > 1) {
-				dprintf(fd, ", ");
+				PSI_DUMP(dump, ", ");
 			}
-			psi_impl_arg_dump(fd, iarg, false);
+			psi_impl_arg_dump(dump, iarg, false);
 		}
 
 		if (func->vararg) {
-			dprintf(fd, ", ");
-			psi_impl_arg_dump(fd, func->vararg, true);
+			PSI_DUMP(dump, ", ");
+			psi_impl_arg_dump(dump, func->vararg, true);
 		}
 	}
-	dprintf(fd, ") : %s%s", func->return_reference ? "&" : "",
+	PSI_DUMP(dump, ") : %s%s", func->return_reference ? "&" : "",
 			func->return_type->name->val);
 }