Changeset 14649

Timestamp:

Feb 8, 2011, 10:58:12 AM (14 years ago)

Author:

Gary Byers

Message:

Only one SHARED-LIBRARY-WITH-NAME; may not need extra arg after
Darwin-specific code is simplified.

File:

• trunk/source/level-0/l0-cfm-support.lisp (modified) (3 diffs)

trunk/source/level-0/l0-cfm-support.lisp

@@ -135 +135 @@
     (not (zerop count))))
 
-(defun shared-library-with-name (name)
+(defun shared-library-with-name (name &optional (is-unloaded nil))
   (let* ((namelen (length name)))
     (dolist (lib *shared-libraries*)
       (let* ((libname (shlib.soname lib)))
-        (when (%simple-string= name libname 0 0 namelen (length libname))
+        (when (and (%simple-string= name libname 0 0 namelen (length libname))
+                   (or (not is-unloaded) (and (null (shlib.map lib))
+                                              (null (shlib.base lib)))))
           (return lib))))))
 
@@ -373 +375 @@
       (return lib))))
 
-(defun shared-library-with-name (name &optional (is-unloaded nil))
-  (let* ((namelen (length name)))
-    (dolist (lib *shared-libraries*)
-      (let* ((libname (shlib.soname lib)))
-        (when (and (%simple-string= name libname 0 0 namelen (length libname))
-                   (or (not is-unloaded) (and (null (shlib.map lib))
-                                              (null (shlib.base lib)))))
-          (return lib))))))
+
 
 ;;;    
@@ -1030 +1025 @@
           (open-shared-library-internal name)
           
-          (call-in-process (lambda () (open-shared-library-internal  name))
+          (call-in-process (lambda ()
+                             (handler-case (open-shared-library-internal  name)
+                               (error (condition) (values nil (format nil "~a" condition)))))
+                                                                     
+                             
                            (if (eq process :initial)
                              *initial-process*