raising the head after a three-weeks refactoring

[m6w6/ext-psi] / src / types / decl_file.c

diff --git a/src/types/decl_file.c b/src/types/decl_file.c
index 8bd793632d090cc3d8df12927777fc790c088e8d..c42570540722774031b2314c76182e0103c140da 100644 (file)
--- a/src/types/decl_file.c
+++ b/src/types/decl_file.c
@@ -5,11 +5,11 @@
  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.
+ * 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
@@ -21,22 +21,15 @@
  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.
-*******************************************************************************/
+ *******************************************************************************/
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#else
-# include "php_config.h"
-#endif
+#include "php_psi_stdinc.h"
+#include "data.h"
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include <dlfcn.h>
 
-#include "data.h"
-
-void free_decl_file(decl_file* file) {
+void psi_decl_file_dtor(struct psi_decl_file *file)
+{
        if (file->ln) {
                free(file->ln);
        }
@@ -46,26 +39,40 @@ void free_decl_file(decl_file* file) {
        memset(file, 0, sizeof(*file));
 }
 
-int validate_file(struct psi_data *data, void **dlopened) {
+bool psi_decl_file_validate(struct psi_data *dst, struct psi_data *src, void **dlopened)
+{
        char lib[MAXPATHLEN];
-       const char *ptr = data->psi.file.ln;
+       const char *ptr = src->file.ln;
        size_t len;
 
        if (!ptr) {
                /* FIXME: assume stdlib */
-               return 1;
+               return true;
        } else if (!strchr(ptr, '/')) {
                len = snprintf(lib, MAXPATHLEN, "lib%s.%s", ptr, PHP_PSI_SHLIB_SUFFIX);
                if (MAXPATHLEN == len) {
-                       data->error(data, NULL, PSI_WARNING, "Library name too long: '%s'", ptr);
+                       dst->error(dst, NULL, PSI_WARNING, "Library name too long: '%s'",
+                                       ptr);
                }
                lib[len] = 0;
                ptr = lib;
        }
-       if (!(*dlopened = dlopen(ptr, RTLD_LAZY|RTLD_LOCAL))) {
-               data->error(data, NULL, PSI_WARNING, "Could not open library '%s': %s.",
-                               data->psi.file.ln, dlerror());
-               return 0;
+       if (!(*dlopened = dlopen(ptr, RTLD_LAZY | RTLD_LOCAL))) {
+               dst->error(dst, NULL, PSI_WARNING, "Could not open library '%s': %s.",
+                               src->file.ln, dlerror());
+               return false;
+       }
+
+       if (!dst->libs) {
+               dst->libs = psi_plist_init((psi_plist_dtor) psi_libs_free);
+       }
+       dst->libs = psi_plist_add(dst->libs, dlopened);
+
+       return true;
+}
+
+void psi_libs_free(void **dlopened) {
+       if (*dlopened) {
+               dlclose(*dlopened);
        }
-       return 1;
 }