types refactoring

[m6w6/ext-psi] / src / types / const_type.h

diff --git a/src/types/const_type.h b/src/types/const_type.h
index af9efb79bd4362ef4b132e4a673136cc61a0efbd..7ca6d6e35bb51c8553ca31b6b19923915fe5f5d6 100644 (file)
--- a/src/types/const_type.h
+++ b/src/types/const_type.h
@@ -1,21 +1,40 @@
-#ifndef _PSI_TYPES_CONST_TYPE_H
-#define _PSI_TYPES_CONST_TYPE_H
+/*******************************************************************************
+ Copyright (c) 2016, Michael Wallner <mike@php.net>.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ 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.
+*******************************************************************************/
+
+#ifndef PSI_TYPES_CONST_TYPE_H
+#define PSI_TYPES_CONST_TYPE_H
+
+#include "token.h"
 
 typedef struct const_type {
        token_t type;
        char *name;
 } const_type;
 
-static inline const_type *init_const_type(token_t type, const char *name) {
-       const_type *ct = calloc(1, sizeof(*ct));
-       ct->type = type;
-       ct->name = strdup(name);
-       return ct;
-}
-
-static inline void free_const_type(const_type *type) {
-       free(type->name);
-       free(type);
-}
+const_type *init_const_type(token_t type, const char *name);
+void free_const_type(const_type *type);
+void dump_const_type(int fd, const_type *type);
 
 #endif