Merge pull request quicklisp#218 from kilianmh/master

Fix various stylistic issues

Author: quicklisp

quicklisp/client-info.lisp

@@ -219,11 +219,11 @@
 
 (defun local-client-info ()
   (let ((info-file (qmerge "client-info.sexp")))
-    (if (probe-file info-file)
-        (load-client-info info-file)
-        (progn
-          (warn "Missing client-info.sexp, using mock info")
-          (mock-client-info)))))
+    (cond ((probe-file info-file)
+           (load-client-info info-file))
+          (t
+           (warn "Missing client-info.sexp, using mock info")
+           (mock-client-info)))))
 
 (defun newest-client-info (&optional (info (local-client-info)))
   (let ((latest (subscription-url info)))

quicklisp/client.lisp

@@ -100,7 +100,7 @@
                                                exclude-local-projects)
   "Write a list of system file pathnames to OUTPUT-FILE, one per line,
 in order of descending QL-DIST:PREFERENCE."
-  (when (or (eql output-file nil)
+  (when (or (null output-file)
             (eql output-file t))
     (setf output-file (qmerge "manifest.txt")))
   (with-open-file (stream output-file

quicklisp/http.lisp

@@ -83,8 +83,7 @@
        ,@(mapcar (lambda (case)
                    (destructuring-bind (keys &rest body)
                        case
-                     `(,(if (eql keys t)
-                            t
+                     `(,(or (eql keys t)
                             (convert-case-keys keys))
                         ,@body)))
                  cases))))
@@ -115,23 +114,23 @@
     (with-slots (pattern pos)
         matcher
       (loop
-       (cond ((= pos match-end)
-              (let ((match-start (- i pos)))
-                (setf pos 0)
-                (setf (matchedp matcher) t)
-                (return (values match-start (+ match-start match-end)))))
-             ((= i end)
-              (return nil))
-             ((= (aref pattern pos)
-                 (aref input i))
-              (incf i)
-              (incf pos))
-             (t
-              (if error
-                  (error 'match-failure)
-                  (if (zerop pos)
-                      (incf i)
-                      (setf pos 0)))))))))
+        (cond ((= pos match-end)
+               (let ((match-start (- i pos)))
+                 (setf pos 0)
+                 (setf (matchedp matcher) t)
+                 (return (values match-start (+ match-start match-end)))))
+              ((= i end)
+               (return nil))
+              ((= (aref pattern pos)
+                  (aref input i))
+               (incf i)
+               (incf pos))
+              (error
+               (error 'match-failure))
+              ((zerop pos)
+               (incf i))
+              (t
+               (setf pos 0)))))))
 
 (defun ascii-matcher (string)
   (make-instance 'matcher
@@ -229,7 +228,8 @@
     (call-processor fun cbuf (start cbuf) (end cbuf))))
 
 (defun multi-cmatch (matchers cbuf)
-  (let (start end)
+  (let ((start nil)
+        (end nil))
     (dolist (matcher matchers (values start end))
       (multiple-value-bind (s e)
           (match matcher (data cbuf)
@@ -328,8 +328,8 @@
           (eql port 443)
           host
           (or (null port)
-              (eql port 80)
-              (eql port 443))
+              (= port 80)
+              (= port 443))
           port
           path))
 
@@ -852,7 +852,7 @@ the indexes in the header accordingly."
                          :status-code (status header))))
            (if (and follow-redirects (<= 300 (status header) 399))
                (let ((new-urlstring (ascii-header-value "location" header)))
-                 (when (not new-urlstring)
+                 (unless new-urlstring
                    (error "Redirect code ~D received, but no Location: header"
                           (status header)))
                  (incf redirect-count)

quicklisp/impl-util.lisp

@@ -337,12 +337,12 @@ quicklisp at CL startup."
     (ql-ccl:delete-directory pathname)))
 
 (defimplementation (delete-directory-tree :qualifier :around) (pathname)
-  (if (directoryp pathname)
-      (call-next-method)
-      (progn
-        (warn "delete-directory-tree - not a directory, ~
-               deleting anyway -- ~s" pathname)
-        (delete-file pathname))))
+  (cond ((directoryp pathname)
+         (call-next-method))
+        (t
+         (warn "delete-directory-tree - not a directory, ~
+                deleting anyway -- ~s" pathname)
+         (delete-file pathname))))
 
 (defun map-directory-tree (directory fun)
   "Call FUN for every file in directory and all its subdirectories,

quicklisp/local-projects.lisp

@@ -49,10 +49,10 @@
 
 (defun local-project-system-files (pathname)
   "Return a list of system files under PATHNAME."
-  (let* ((files (matching-directory-files pathname
-                                          (lambda (file)
-                                            (equalp (pathname-type file)
-                                                    "asd")))))
+  (let ((files (matching-directory-files pathname
+                                         (lambda (file)
+                                           (equalp (pathname-type file)
+                                                   "asd")))))
     (setf files (sort files
                       #'string<
                       :key #'namestring))

quicklisp/network.lisp

@@ -130,7 +130,7 @@
   closes the connection afterwareds via CLOSE-CONNECTION in an
   unwind-protect. See also WITH-CONNECTION.")
   (:implementation t
-    (let (connection)
+    (let ((connection nil))
       (unwind-protect
            (progn
              (setf connection (open-connection host port))

quicklisp/setup.lisp

@@ -18,7 +18,7 @@
                (unless system
                  (error "Unknown system ~S" name))
                (ensure-installed system)
-               (mapcar #'recurse (required-systems system))
+               (mapc #'recurse (required-systems system))
                name)))
     (with-consistent-dists
       (recurse name))))