types refactoring

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

diff --git a/src/types/set_func.h b/src/types/set_func.h
index 54d61d38ebc640b33113813a61457c5a985c779d..f774114b1c40b376db8ddc2d0aa519ad35a58004 100644 (file)
--- a/src/types/set_func.h
+++ b/src/types/set_func.h
@@ -1,5 +1,33 @@
-#ifndef _PSI_TYPES_SET_FUNC_H
-#define _PSI_TYPES_SET_FUNC_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_SET_FUNC_H
+#define PSI_TYPES_SET_FUNC_H
+
+#include "token.h"
+#include "impl_val.h"
 
 struct set_value;
 
@@ -10,19 +38,7 @@ typedef struct set_func {
        void (*handler)(zval *, struct set_value *set, impl_val *ret_val);
 } set_func;
 
-static inline set_func *init_set_func(token_t type, const char *name) {
-       set_func *func = calloc(1, sizeof(*func));
-       func->type = type;
-       func->name = strdup(name);
-       return func;
-}
-
-static inline void free_set_func(set_func *func) {
-       if (func->token) {
-               free(func->token);
-       }
-       free(func->name);
-       free(func);
-}
+set_func *init_set_func(token_t type, const char *name);
+void free_set_func(set_func *func);
 
 #endif