got rid of peer-info

vii · Feb 23, 2009 · c41c0c5 · c41c0c5
1 parent 3cb8f39
commit c41c0c5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/src/blog/entry.lisp b/src/blog/entry.lisp
@@ -7,10 +7,16 @@
   (time :initform (get-universal-time))
   trace-details)
 
+(defun split-into-paragraphs (str)
+  (match-split (progn #\Newline (* (or #\Space #\Tab #\Return)) #\Newline)
+	       str))
+(defun split-into-paragraphs-by-single-line (str)
+  (match-split #\Newline 
+	       str))
 
 (my-defun comment 'object-to-ml ()
   (<div :class "comment"
-	(<p :style (css-attrib :white-space "pre") (my text))
+	(loop for p in (split-into-paragraphs-by-single-line (my text)) do (<p p))
 
 	(<p :class "time" "Posted " (time-string (my time)) " by " (<span :class "author" (my author)))))
 
@@ -27,12 +33,6 @@
 	(output-object-to-ml
 	 (my comments))))
 
-(defun split-into-paragraphs (str)
-  (match-split (progn #\Newline (* (or #\Space #\Tab #\Return)) #\Newline)
-	       str))
-(defun split-into-paragraphs-by-single-line (str)
-  (match-split #\Newline 
-	       str))
 
 (defun time-string (&optional (ut (get-universal-time)))
   (multiple-value-bind

diff --git a/src/io/peer-info.lisp b/src/io/peer-info.lisp
diff --git a/src/io/posix-socket.lisp b/src/io/posix-socket.lisp
@@ -47,7 +47,7 @@
 		 (set-fd-nonblock s)
 		 (make-con 
 		  :socket s
-		  :peer-info (make-peer-info :address (cffi:foreign-slot-value sa 'sockaddr_in 'addr)))))))))
+		  :peer-info (sockaddr-address-string sa))))))))
 
 
 (defmethod socket-close ( (fd integer) )

diff --git a/teepeedee2.asd b/teepeedee2.asd
@@ -49,12 +49,11 @@
 				     (:module :io
 					       :depends-on (:lib)
 					       :components (
-							    (:file "peer-info")
 							    (:file "socket")
 							    (:file "recvbuf" :depends-on ("socket"))
 							    (:file "sendbuf" :depends-on ("socket" "syscalls"))
 							    (:file "posix-socket" :depends-on ("syscalls" "socket" "con"))
-							    (:file "con" :depends-on ("peer-info" "sendbuf" "recvbuf"))
+							    (:file "con" :depends-on ("sendbuf" "recvbuf"))
 							    (:file "mux" :depends-on ("con"))
 							    (:file "epoll" :depends-on ("syscalls" "mux"))
 							    (:file "syscalls")