From 176200bce232871a0f3ea629e876a1969b2c97a0 Mon Sep 17 00:00:00 2001
From: Stelian Ionescu <sionescu@common-lisp.net>
Date: Thu, 27 Dec 2007 02:35:13 +0100
Subject: [PATCH] Miscellaneous cosmetic changes.

Signed-off-by: Stelian Ionescu <sionescu@common-lisp.net>
---
 io.event/factory.lisp               | 4 ++--
 io.streams/gray-stream-methods.lisp | 4 ++--
 sockets/common.lisp                 | 2 +-
 sockets/make-socket.lisp            | 2 +-
 tests/streams.lisp                  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/io.event/factory.lisp b/io.event/factory.lisp
index 7403573..be1c465 100644
--- a/io.event/factory.lisp
+++ b/io.event/factory.lisp
@@ -191,7 +191,7 @@ new PROTOCOL onto the SERVER's connection list."
 
 ;;; Any better syntax suggestions?
 (defmacro with-async-handler (return-vars form error-clauses &body body)
-  (with-unique-names (result-deferred)
+  (with-gensyms (result-deferred)
     `(let ((,result-deferred ,form))
        (setf (result-callback-of ,result-deferred)
              (lambda ,return-vars ,@body))
@@ -209,7 +209,7 @@ new PROTOCOL onto the SERVER's connection list."
 ;;; WITH-ASYNC-HANDLER should check whether it actually got a deferred
 ;;; object.
 (defmacro with-deferred-result (() &body body)
-  (with-unique-names (body-fn)
+  (with-gensyms (body-fn)
     `(flet ((,body-fn () ,@body))
        (if (boundp '*current-event-base*)
            (,body-fn)
diff --git a/io.streams/gray-stream-methods.lisp b/io.streams/gray-stream-methods.lisp
index 64b758c..78819c4 100644
--- a/io.streams/gray-stream-methods.lisp
+++ b/io.streams/gray-stream-methods.lisp
@@ -122,7 +122,7 @@
      :finally (return offset)))
 
 (defmacro check-bounds (sequence start end)
-  (alexandria:with-unique-names (length)
+  (with-gensyms (length)
     `(let ((,length (length ,sequence)))
        (unless ,end
          (setq ,end ,length))
@@ -316,7 +316,7 @@
                (iobuf-copy-data-to-start ib)
                (setf unread-index 0)))
         ;; line-end handling
-        (alexandria:when-let ((it (maybe-find-line-ending fd ib ef)))
+        (when-let ((it (maybe-find-line-ending fd ib ef)))
           (return-from stream-read-char it))
         (tagbody :start
            (handler-case
diff --git a/sockets/common.lisp b/sockets/common.lisp
index b928409..124a276 100644
--- a/sockets/common.lisp
+++ b/sockets/common.lisp
@@ -204,7 +204,7 @@
 ;;;; Misc
 
 (defmacro check-bounds (sequence start end)
-  (with-unique-names (length)
+  (with-gensyms (length)
     `(let ((,length (length ,sequence)))
        (unless ,end
          (setq ,end ,length))
diff --git a/sockets/make-socket.lisp b/sockets/make-socket.lisp
index fbc2879..c2f0452 100644
--- a/sockets/make-socket.lisp
+++ b/sockets/make-socket.lisp
@@ -36,7 +36,7 @@
 (defmacro %with-close-on-error ((var value) &body body)
   "Bind VAR to VALUE, execute BODY as implicit PROGN and return VAR.
 On error call CLOSE with :ABORT T on VAR."
-  (with-unique-names (errorp)
+  (with-gensyms (errorp)
     `(let ((,var ,value) (,errorp t))
        (unwind-protect (prog1 (locally ,@body ,var) (setf ,errorp nil))
          (when (and ,var ,errorp) (close ,var :abort t))))))
diff --git a/tests/streams.lisp b/tests/streams.lisp
index b42c3e7..786c043 100644
--- a/tests/streams.lisp
+++ b/tests/streams.lisp
@@ -70,7 +70,7 @@
                    :external-format external-format)))
 
 (defmacro with-open-file-stream ((var path &rest options) &body body)
-  (with-unique-names (stream)
+  (with-gensyms (stream)
     `(let ((,stream (make-file-stream ,path ,@options)))
        (with-open-stream (,var ,stream)
          ,@body))))
-- 
2.11.4.GIT