update readme

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

diff --git a/src/types/let_calloc.c b/src/types/let_calloc.c
index e14ef69c2690eb5df6e3fbeb6c769e1172fa96e6..270e3c5c43ac7a441e0fee18cd71b004a10c2e45 100644 (file)
--- a/src/types/let_calloc.c
+++ b/src/types/let_calloc.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_let_calloc *psi_let_calloc_init(struct psi_num_exp *nmemb,
                struct psi_num_exp *size)
 {
-       struct psi_let_calloc *alloc = calloc(1, sizeof(*alloc));
+       struct psi_let_calloc *alloc = pecalloc(1, sizeof(*alloc), 1);
 
        alloc->nmemb = nmemb;
        alloc->size = size;
@@ -45,18 +49,16 @@ void psi_let_calloc_free(struct psi_let_calloc **alloc_ptr)
                *alloc_ptr = NULL;
                psi_num_exp_free(&alloc->nmemb);
                psi_num_exp_free(&alloc->size);
-               if (alloc->token) {
-                       free(alloc->token);
-               }
+               psi_token_free(&alloc->token);
                free(alloc);
        }
 }
 
-void psi_let_calloc_dump(int fd, struct psi_let_calloc *alloc)
+void psi_let_calloc_dump(struct psi_dump *dump, struct psi_let_calloc *alloc)
 {
-       dprintf(fd, "calloc(");
-       psi_num_exp_dump(fd, alloc->nmemb);
-       dprintf(fd, ", ");
-       psi_num_exp_dump(fd, alloc->size);
-       dprintf(fd, ")");
+       PSI_DUMP(dump, "calloc(");
+       psi_num_exp_dump(dump, alloc->nmemb);
+       PSI_DUMP(dump, ", ");
+       psi_num_exp_dump(dump, alloc->size);
+       PSI_DUMP(dump, ")");
 }