types refactoring

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

diff --git a/src/types/free_calls.h b/src/types/free_calls.h
index 7d4f575c5eb84b9b237671196cfe79510e7611c4..9e156ed877a98ff44761ded814b00afa94b65114 100644 (file)
--- a/src/types/free_calls.h
+++ b/src/types/free_calls.h
@@ -1,35 +1,40 @@
-#ifndef _PSI_TYPES_FREE_CALLS_H
-#define _PSI_TYPES_FREE_CALLS_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_FREE_CALLS_H
+#define PSI_TYPES_FREE_CALLS_H
+
+#include "free_call.h"
 
 typedef struct free_calls {
        free_call **list;
        size_t count;
 } free_calls;
 
-static inline free_calls *init_free_calls(free_call *f) {
-       free_calls *fcs = calloc(1, sizeof(*fcs));
-       if (f) {
-               fcs->count = 1;
-               fcs->list = calloc(1, sizeof(*fcs->list));
-               fcs->list[0] = f;
-       }
-       return fcs;
-}
-
-static inline void free_free_calls(free_calls *fcs) {
-       size_t i;
-
-       for (i = 0; i < fcs->count; ++i) {
-               free_free_call(fcs->list[i]);
-       }
-       free(fcs->list);
-       free(fcs);
-}
-
-static inline free_calls *add_free_call(free_calls *fcs, free_call *f) {
-       fcs->list = realloc(fcs->list, ++fcs->count * sizeof(*fcs->list));
-       fcs->list[fcs->count-1] = f;
-       return fcs;
-}
+free_calls *init_free_calls(free_call *f);
+void free_free_calls(free_calls *fcs);
+free_calls *add_free_call(free_calls *fcs, free_call *f);
 
 #endif