types refactoring

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

diff --git a/src/types/constants.h b/src/types/constants.h
index 36352ab6538f385ab3009fde3544312a344cef55..a41cde544d22018b9210cfa082a2bb92591cb8c6 100644 (file)
--- a/src/types/constants.h
+++ b/src/types/constants.h
@@ -1,28 +1,40 @@
-#ifndef _PSI_TYPES_CONSTANTS_H
-#define _PSI_TYPES_CONSTANTS_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_CONSTANTS_H
+#define PSI_TYPES_CONSTANTS_H
+
+#include "constant.h"
 
 typedef struct constants {
        size_t count;
        constant **list;
 } constants;
 
-static inline constants *add_constant(constants *constants, constant *constant) {
-       if (!constants) {
-               constants = calloc(1, sizeof(*constants));
-       }
-       constants->list = realloc(constants->list, ++constants->count * sizeof(*constants->list));
-       constants->list[constants->count-1] = constant;
-       return constants;
-}
-
-static inline void free_constants(constants *c) {
-       size_t i;
-
-       for (i = 0; i < c->count; ++i) {
-               free_constant(c->list[i]);
-       }
-       free(c->list);
-       free(c);
-}
+constants *add_constant(constants *constants, constant *constant);
+void free_constants(constants *constants);
+void dump_constants(int fd, constants *constants);
 
 #endif