r11859: Canonicalize whitespace

[uffi.git] / src / libraries.lisp

diff --git a/src/libraries.lisp b/src/libraries.lisp
index 59b5907c622b96c3a31974ce793cbc621810a5bf..886464e362663a65615115b62dcf21d4115cc643 100644 (file)
--- a/src/libraries.lisp
+++ b/src/libraries.lisp
@@ -52,30 +52,30 @@ library type if type is not specified."
   (dolist (drive-letter drive-letters)
     (dolist (name names)
       (dolist (dir directories)
-       (dolist (type types)
-         (let ((path (make-pathname
-                      #+lispworks :host
-                      #+lispworks (when drive-letter drive-letter)
-                      #-lispworks :device
-                      #-lispworks (when drive-letter drive-letter)
-                      :name name
-                      :type type
-                      :directory
-                      (etypecase dir
-                        (pathname
-                         (pathname-directory dir))
-                        (list
-                         dir)
-                        (string
-                         (pathname-directory
-                          (parse-namestring dir)))))))
-           (when (probe-file path)
-             (return-from find-foreign-library path)))))))
+        (dolist (type types)
+          (let ((path (make-pathname
+                       #+lispworks :host
+                       #+lispworks (when drive-letter drive-letter)
+                       #-lispworks :device
+                       #-lispworks (when drive-letter drive-letter)
+                       :name name
+                       :type type
+                       :directory
+                       (etypecase dir
+                         (pathname
+                          (pathname-directory dir))
+                         (list
+                          dir)
+                         (string
+                          (pathname-directory
+                           (parse-namestring dir)))))))
+            (when (probe-file path)
+              (return-from find-foreign-library path)))))))
    nil)
 
 
 (defun load-foreign-library (filename &key module supporting-libraries
-                                          force-load)
+                                           force-load)
   #+(or allegro openmcl digitool sbcl) (declare (ignore module supporting-libraries))
   #+(or cmu scl) (declare (ignore module))
   #+lispworks (declare (ignore supporting-libraries))
@@ -95,37 +95,37 @@ library type if type is not specified."
                (find filename *loaded-libraries* :test #'string-equal))
           t ;; return T, but don't reload library
       (progn
-       #+cmu
-       (let ((type (pathname-type (parse-namestring filename))))
-         (if (string-equal type "so")
-             (unless
+        #+cmu
+        (let ((type (pathname-type (parse-namestring filename))))
+          (if (string-equal type "so")
+              (unless
                   (sys::load-object-file filename)
                 (load-failure))
-             (alien:load-foreign filename
-                                 :libraries
-                                 (convert-supporting-libraries-to-string
-                                  supporting-libraries))))
-       #+scl
-       (let ((type (pathname-type (parse-namestring filename))))
-         (alien:load-foreign filename
-                             :libraries
-                             (convert-supporting-libraries-to-string
-                              supporting-libraries)))
-       #+sbcl
-       (handler-case (sb-alien::load-1-foreign filename)
-         (sb-int:unsupported-operator (c)
-           (if (fboundp (intern "LOAD-SHARED-OBJECT" :sb-alien))
-               (funcall (intern "LOAD-SHARED-OBJECT" :sb-alien) filename)
-               (error c))))
+              (alien:load-foreign filename
+                                  :libraries
+                                  (convert-supporting-libraries-to-string
+                                   supporting-libraries))))
+        #+scl
+        (let ((type (pathname-type (parse-namestring filename))))
+          (alien:load-foreign filename
+                              :libraries
+                              (convert-supporting-libraries-to-string
+                               supporting-libraries)))
+        #+sbcl
+        (handler-case (sb-alien::load-1-foreign filename)
+          (sb-int:unsupported-operator (c)
+            (if (fboundp (intern "LOAD-SHARED-OBJECT" :sb-alien))
+                (funcall (intern "LOAD-SHARED-OBJECT" :sb-alien) filename)
+                (error c))))
 
-       #+lispworks (fli:register-module module :real-name filename
+        #+lispworks (fli:register-module module :real-name filename
                                          :connection-style :immediate)
-       #+allegro (load filename)
-       #+openmcl (ccl:open-shared-library filename)
-       #+digitool (ccl:add-to-shared-library-search-path filename t)
+        #+allegro (load filename)
+        #+openmcl (ccl:open-shared-library filename)
+        #+digitool (ccl:add-to-shared-library-search-path filename t)
 
-       (push filename *loaded-libraries*)
-       t)))))
+        (push filename *loaded-libraries*)
+        t)))))
 
 (defun convert-supporting-libraries-to-string (libs)
   (let (lib-load-list)