[cl-plus-ssl-cvs] CVS update: cl+ssl/bio.lisp cl+ssl/conditions.lisp

[David Lichteblau]

Update of /project/cl-plus-ssl/cvsroot/cl+ssl
In directory common-lisp.net:/tmp/cvs-serv13274

Modified Files:
	bio.lisp conditions.lisp 
Log Message:
upgrade to current cffi (thanks to Jan Idzikowski)

Date: Tue Dec 13 22:17:28 2005
Author: dlichteblau

Index: cl+ssl/bio.lisp
diff -u cl+ssl/bio.lisp:1.2 cl+ssl/bio.lisp:1.3
--- cl+ssl/bio.lisp:1.2	Fri Nov 25 21:14:04 2005
+++ cl+ssl/bio.lisp	Tue Dec 13 22:16:30 2005
@@ -52,11 +52,11 @@
       (setf (slot 'bwrite) (cffi:callback lisp-write))
       (setf (slot 'bread) (cffi:callback lisp-read))
       (setf (slot 'bputs) (cffi:callback lisp-puts))
-      (setf (slot 'bgets) (cffi:null-ptr))
+      (setf (slot 'bgets) (cffi:null-pointer))
       (setf (slot 'ctrl) (cffi:callback lisp-ctrl))
       (setf (slot 'create) (cffi:callback lisp-create))
       (setf (slot 'destroy) (cffi:callback lisp-destroy))
-      (setf (slot 'callback-ctrl) (cffi:null-ptr)))
+      (setf (slot 'callback-ctrl) (cffi:null-pointer)))
     m))
 
 (defun bio-new-lisp ()
@@ -89,7 +89,7 @@
   bio buf n
   (let ((i 0))
     (handler-case
-	(unless (or (cffi:null-ptr-p buf) (null n))
+	(unless (or (cffi:null-pointer-p buf) (null n))
 	  (clear-retry-flags bio)
 	  (when (or *blockp* (listen *socket*))
             (setf (cffi:mem-ref buf :unsigned-char i) (read-byte *socket*))
@@ -121,13 +121,13 @@
 (cffi:defcallback lisp-create :int ((bio :pointer))
   (setf (cffi:foreign-slot-value bio 'bio 'init) 1)
   (setf (cffi:foreign-slot-value bio 'bio 'num) 0)
-  (setf (cffi:foreign-slot-value bio 'bio 'ptr) (cffi:null-ptr))
+  (setf (cffi:foreign-slot-value bio 'bio 'ptr) (cffi:null-pointer))
   (setf (cffi:foreign-slot-value bio 'bio 'flags) 0)
   1)
 
 (cffi:defcallback lisp-destroy :int ((bio :pointer))
   (cond
-    ((cffi:null-ptr-p bio) 0)
+    ((cffi:null-pointer-p bio) 0)
     (t
       (setf (cffi:foreign-slot-value bio 'bio 'init) 0)
       (setf (cffi:foreign-slot-value bio 'bio 'flags) 0)


Index: cl+ssl/conditions.lisp
diff -u cl+ssl/conditions.lisp:1.1.1.1 cl+ssl/conditions.lisp:1.2
--- cl+ssl/conditions.lisp:1.1.1.1	Wed Nov  9 23:10:44 2005
+++ cl+ssl/conditions.lisp	Tue Dec 13 22:16:36 2005
@@ -185,7 +185,7 @@
   (loop
       for error-code = (err-get-error)
       until (zerop error-code)
-      do (format stream "~a~%" (err-error-string error-code (cffi:null-ptr)))))
+      do (format stream "~a~%" (err-error-string error-code (cffi:null-pointer)))))
 
 (defun ssl-signal-error (handle syscall error-code original-error)
   (let ((queue (with-output-to-string (s) (write-ssl-error-queue s))))