types refactoring

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

diff --git a/src/types/decls.h b/src/types/decls.h
index 7f40b7c94b5edff55c3ae5b362544d383327a146..9ccae741471d55048186a05a4e9fdf9bb3ad7a13 100644 (file)
--- a/src/types/decls.h
+++ b/src/types/decls.h
@@ -1,28 +1,40 @@
-#ifndef _PSI_TYPES_DECLS_H
-#define _PSI_TYPES_DECLS_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_DECLS_H
+#define PSI_TYPES_DECLS_H
+
+#include "decl.h"
 
 typedef struct decls {
        size_t count;
        decl **list;
 } decls;
 
-static inline decls *add_decl(decls *decls, decl *decl) {
-       if (!decls) {
-               decls = calloc(1, sizeof(*decls));
-       }
-       decls->list = realloc(decls->list, ++decls->count * sizeof(*decls->list));
-       decls->list[decls->count-1] = decl;
-       return decls;
-}
-
-static inline void free_decls(decls *decls) {
-       size_t i;
-
-       for (i = 0; i < decls->count; ++i) {
-               free_decl(decls->list[i]);
-       }
-       free(decls->list);
-       free(decls);
-}
+decls *add_decl(decls *decls, decl *decl);
+void free_decls(decls *decls);
+void dump_decls(int fd, decls *decls);
 
 #endif