types refactoring

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

diff --git a/src/types/constant.h b/src/types/constant.h
index 85e467b7da403022bb59c13221a091898ef54668..c09fc100625851a2f30f12f5c4e51f34692672d2 100644 (file)
--- a/src/types/constant.h
+++ b/src/types/constant.h
@@ -1,5 +1,33 @@
-#ifndef _PSI_TYPES_CONSTANT_H
-#define _PSI_TYPES_CONSTANT_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_CONSTANT_H
+#define PSI_TYPES_CONSTANT_H
+
+#include "const_type.h"
+#include "impl_def_val.h"
 
 typedef struct constant {
        const_type *type;
@@ -7,19 +35,11 @@ typedef struct constant {
        impl_def_val *val;
 } constant;
 
-static inline constant *init_constant(const_type *type, const char *name, impl_def_val *val) {
-       constant *c = calloc(1, sizeof(*c));
-       c->type = type;
-       c->name = strdup(name);
-       c->val = val;
-       return c;
-}
-
-static inline void free_constant(constant *constant) {
-       free_const_type(constant->type);
-       free(constant->name);
-       free_impl_def_val(constant->val);
-       free(constant);
-}
+constant *init_constant(const_type *type, const char *name,    impl_def_val *val);
+void free_constant(constant *constant);
+void dump_constant(int fd, constant *cnst);
+
+struct psi_data;
 
+int validate_constant(struct psi_data *data, constant *c);
 #endif