raising the head after a three-weeks refactoring

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

diff --git a/src/types/let_calloc.c b/src/types/let_calloc.c
index 7c231122f4babb553d370dee6ae07b5dc6cdf9df..e14ef69c2690eb5df6e3fbeb6c769e1172fa96e6 100644 (file)
--- a/src/types/let_calloc.c
+++ b/src/types/let_calloc.c
@@ -5,11 +5,11 @@
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
 
-     * Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-     * Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
 
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -21,28 +21,42 @@
  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*******************************************************************************/
+ *******************************************************************************/
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#else
-# include "php_config.h"
-#endif
+#include "php_psi_stdinc.h"
+#include "data.h"
 
-#include <stdlib.h>
-#include <stdio.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));
 
-#include "let_calloc.h"
-
-let_calloc *init_let_calloc(num_exp *nmemb, num_exp *size) {
-       let_calloc *alloc = calloc(1, sizeof(*alloc));
        alloc->nmemb = nmemb;
        alloc->size = size;
+
        return alloc;
 }
 
-void free_let_calloc(let_calloc *alloc) {
-       free_num_exp(alloc->nmemb);
-       free_num_exp(alloc->size);
-       free(alloc);
+void psi_let_calloc_free(struct psi_let_calloc **alloc_ptr)
+{
+       if (*alloc_ptr) {
+               struct psi_let_calloc *alloc = *alloc_ptr;
+
+               *alloc_ptr = NULL;
+               psi_num_exp_free(&alloc->nmemb);
+               psi_num_exp_free(&alloc->size);
+               if (alloc->token) {
+                       free(alloc->token);
+               }
+               free(alloc);
+       }
+}
+
+void psi_let_calloc_dump(int fd, 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, ")");
 }