Merge branch 'slimconfigure'

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

diff --git a/src/types/impl_type.c b/src/types/impl_type.c
index a5b21889e225d2964109796dc32f84385a8b354c..25b1f1f5f254ae302b0260305cd9846adcff865f 100644 (file)
--- a/src/types/impl_type.c
+++ b/src/types/impl_type.c
@@ -23,26 +23,34 @@
  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>
-#include <string.h>
+struct psi_impl_type *psi_impl_type_init(token_t type, const char *name)
+{
+       struct psi_impl_type *t = calloc(1, sizeof(*t));
 
-#include "impl_type.h"
-
-impl_type *init_impl_type(token_t type, const char *name) {
-       impl_type *t = calloc(1, sizeof(*t));
        t->type = type;
        t->name = strdup(name);
+
        return t;
 }
 
-void free_impl_type(impl_type *type) {
-       free(type->name);
-       free(type);
+void psi_impl_type_dump(int fd, struct psi_impl_type *type)
+{
+       dprintf(fd, "%s", type->name);
+}
+
+void psi_impl_type_free(struct psi_impl_type **type_ptr)
+{
+       if (*type_ptr) {
+               struct psi_impl_type *type = *type_ptr;
+
+               *type_ptr = NULL;
+               if (type->token) {
+                       free(type->token);
+               }
+               free(type->name);
+               free(type);
+       }
 }