types refactoring

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

diff --git a/src/types/decl_vars.h b/src/types/decl_vars.h
index 46c65bd44db5b7749d89d83bd1b18790342d9e19..22b03e86474ee43410acf45a493c6eb88a8fd047 100644 (file)
--- a/src/types/decl_vars.h
+++ b/src/types/decl_vars.h
@@ -1,35 +1,40 @@
-#ifndef _PSI_TYPES_DECL_VARS_H
-#define _PSI_TYPES_DECL_VARS_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_DECL_VARS_H
+#define PSI_TYPES_DECL_VARS_H
+
+#include "decl_var.h"
 
 typedef struct decl_vars {
        decl_var **vars;
        size_t count;
 } decl_vars;
 
-static inline decl_vars *init_decl_vars(decl_var *var) {
-       decl_vars *vars = calloc(1, sizeof(*vars));
-       if (var) {
-               vars->count = 1;
-               vars->vars = calloc(1, sizeof(*vars->vars));
-               vars->vars[0] = var;
-       }
-       return vars;
-}
-
-static inline decl_vars *add_decl_var(decl_vars *vars, decl_var *var) {
-       vars->vars = realloc(vars->vars, ++vars->count * sizeof(*vars->vars));
-       vars->vars[vars->count-1] = var;
-       return vars;
-}
-
-static inline void free_decl_vars(decl_vars *vars) {
-       size_t i;
-
-       for (i = 0; i < vars->count; ++i) {
-               free_decl_var(vars->vars[i]);
-       }
-       free(vars->vars);
-       free(vars);
-}
+decl_vars *init_decl_vars(decl_var *var);
+decl_vars *add_decl_var(decl_vars *vars, decl_var *var);
+void free_decl_vars(decl_vars *vars);
 
 #endif