projects
/
uffi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r1529: *** empty log message ***
[uffi.git]
/
src
/
strings.cl
diff --git
a/src/strings.cl
b/src/strings.cl
index 0e1e20de513da50e414010a83c03e8768f46dad6..0f0c54cfef695065f72a45ee6ffca455a34f8eda 100644
(file)
--- a/
src/strings.cl
+++ b/
src/strings.cl
@@
-9,7
+9,7
@@
;;;;
;;;; Copyright (c) 2002 Kevin M. Rosenberg
;;;;
;;;;
;;;; Copyright (c) 2002 Kevin M. Rosenberg
;;;;
-;;;; $Id: strings.cl,v 1.
3 2002/03/10 05:09:00
kevin Exp $
+;;;; $Id: strings.cl,v 1.
4 2002/03/10 11:13:07
kevin Exp $
;;;;
;;;; This file is part of the UFFI.
;;;;
;;;;
;;;; This file is part of the UFFI.
;;;;
@@
-31,7
+31,12
@@
(in-package :uffi)
(in-package :uffi)
-(defmacro convert-from-c-string (obj)
+(def-constant +null-cstring-pointer+
+ #+cmu nil
+ #+allegro 0
+ #+lispworks (fli:make-pointer :address 0 :type :char))
+
+(defmacro convert-from-cstring (obj)
"Converts a string from a c-call. Same as convert-from-foreign-string, except
that CMU automatically converts strings from c-calls."
#+cmu obj
"Converts a string from a c-call. Same as convert-from-foreign-string, except
that CMU automatically converts strings from c-calls."
#+cmu obj
@@
-49,10
+54,10
@@
that CMU automatically converts strings from c-calls."
(values (excl:native-to-string ,stored)))))
)
(values (excl:native-to-string ,stored)))))
)
-(defmacro convert-to-c
-
string (obj)
+(defmacro convert-to-cstring (obj)
#+lispworks
`(if (null ,obj)
#+lispworks
`(if (null ,obj)
- +null-c
-
string-pointer+
+ +null-cstring-pointer+
(fli:make-pointer
:address (fli:pointer-address (fli:convert-to-foreign-string ,obj))
:type :char))
(fli:make-pointer
:address (fli:pointer-address (fli:convert-to-foreign-string ,obj))
:type :char))
@@
-64,7
+69,7
@@
that CMU automatically converts strings from c-calls."
(declare (ignore obj))
)
(declare (ignore obj))
)
-(defmacro free-c
-
string (obj)
+(defmacro free-cstring (obj)
#+lispworks
`(unless (fli:null-pointer-p ,obj)
(fli:free-foreign-object ,obj))
#+lispworks
`(unless (fli:null-pointer-p ,obj)
(fli:free-foreign-object ,obj))
@@
-95,7
+100,7
@@
that CMU automatically converts strings from c-calls."
:null-terminated-p ,null-terminated-p
:external-format '(:latin-1 :eol-style :lf)))
#+cmu
:null-terminated-p ,null-terminated-p
:external-format '(:latin-1 :eol-style :lf)))
#+cmu
- `(cmucl-naturalize-c
-
string (alien:alien-sap ,obj)
+ `(cmucl-naturalize-cstring (alien:alien-sap ,obj)
:length ,length
:null-terminated-p ,null-terminated-p)
)
:length ,length
:null-terminated-p ,null-terminated-p)
)
@@
-103,7
+108,7
@@
that CMU automatically converts strings from c-calls."
(defmacro convert-to-foreign-string (obj)
#+lispworks
`(if (null ,obj)
(defmacro convert-to-foreign-string (obj)
#+lispworks
`(if (null ,obj)
- +null-c
-
string-pointer+
+ +null-cstring-pointer+
(fli:make-pointer
:address (fli:pointer-address (fli:convert-to-foreign-string ,obj))
:type :char))
(fli:make-pointer
:address (fli:pointer-address (fli:convert-to-foreign-string ,obj))
:type :char))
@@
-148,7
+153,7
@@
that CMU automatically converts strings from c-calls."
`(ff:allocate-fobject :char :c ,size)
)
`(ff:allocate-fobject :char :c ,size)
)
-(defmacro with-c
-
string ((foreign-string lisp-string) &body body)
+(defmacro with-cstring ((foreign-string lisp-string) &body body)
#+cmu
`(let ((,foreign-string ,lisp-string)) ,@body)
#+allegro
#+cmu
`(let ((,foreign-string ,lisp-string)) ,@body)
#+allegro
@@
-158,7
+163,7
@@
that CMU automatically converts strings from c-calls."
,@body)))
#+lispworks
(let ((result (gensym)))
,@body)))
#+lispworks
(let ((result (gensym)))
- `(let* ((,foreign-string (convert-to-c
-
string ,lisp-string))
+ `(let* ((,foreign-string (convert-to-cstring ,lisp-string))
(,result ,@body))
(fli:free-foreign-object ,foreign-string)
,result))
(,result ,@body))
(fli:free-foreign-object ,foreign-string)
,result))
@@
-166,7
+171,7
@@
that CMU automatically converts strings from c-calls."
;; Modified from CMUCL's source to handle non-null terminated strings
#+cmu
;; Modified from CMUCL's source to handle non-null terminated strings
#+cmu
-(defun cmucl-naturalize-c
-
string (sap &key
+(defun cmucl-naturalize-cstring (sap &key
length
(null-terminated-p t))
(declare (type system:system-area-pointer sap))
length
(null-terminated-p t))
(declare (type system:system-area-pointer sap))