types refactoring

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

diff --git a/src/types/decl_libs.h b/src/types/decl_libs.h
index 0ac669e02a45903b41065ce6c44bdcac77656ecb..1bfce0e5673ca38ad93a9908541cba8294d34527 100644 (file)
--- a/src/types/decl_libs.h
+++ b/src/types/decl_libs.h
@@ -1,27 +1,37 @@
-#ifndef _PSI_TYPES_DECL_LIBS_H
-#define _PSI_TYPES_DECL_LIBS_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_LIBS_H
+#define PSI_TYPES_DECL_LIBS_H
 
 typedef struct decl_libs {
        void **dl;
        size_t count;
 } decl_libs;
 
-static inline void free_decl_libs(decl_libs *libs) {
-       if (libs->dl) {
-               size_t i;
-               for (i = 0; i < libs->count; ++i) {
-                       if (libs->dl[i]) {
-                               dlclose(libs->dl[i]);
-                       }
-               }
-               free(libs->dl);
-       }
-       memset(libs, 0, sizeof(*libs));
-}
-
-static inline void add_decl_lib(decl_libs *libs, void *dlopened) {
-       libs->dl = realloc(libs->dl, ++libs->count * sizeof(*libs->dl));
-       libs->dl[libs->count-1] = dlopened;
-}
+void free_decl_libs(decl_libs *libs);
+void add_decl_lib(decl_libs *libs, void *dlopened);
 
 #endif