types refactoring

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

diff --git a/src/types/set_values.h b/src/types/set_values.h
index b089372725328d8ad94a27f7032d072e5955a332..8d78dc80ab67e8aafbb681d668fd6dd960d71780 100644 (file)
--- a/src/types/set_values.h
+++ b/src/types/set_values.h
@@ -1,40 +1,40 @@
-#ifndef _PSI_TYPES_SET_VALUES_H
-#define _PSI_TYPES_SET_VALUES_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_VALUES_H
+#define PSI_TYPES_SET_VALUES_H
+
+#include "set_value.h"
 
 typedef struct set_values {
-       struct set_value **vals;
+       set_value **vals;
        size_t count;
 } set_values;
 
-static inline set_values *init_set_values(struct set_value *val) {
-       set_values *vals = calloc(1, sizeof(*vals));
-       if (val) {
-               vals->count = 1;
-               vals->vals = calloc(1, sizeof(val));
-               vals->vals[0] = val;
-       }
-       return vals;
-}
-
-static inline set_values *add_set_value(set_values *vals, struct set_value *val) {
-       if (!vals) {
-               vals = calloc(1, sizeof(*vals));
-       }
-       vals->vals = realloc(vals->vals, ++vals->count * sizeof(val));
-       vals->vals[vals->count-1] = val;
-       return vals;
-}
-
-static inline void free_set_values(set_values *vals) {
-       if (vals->vals) {
-               size_t i;
-
-               for (i = 0; i < vals->count; ++i) {
-                       free_set_value(vals->vals[i]);
-               }
-               free(vals->vals);
-       }
-       free(vals);
-}
+set_values *init_set_values(set_value *val);
+set_values *add_set_value(set_values *vals, set_value *val);
+void free_set_values(set_values *vals);
 
 #endif