projects
/
uffi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r1581: *** empty log message ***
[uffi.git]
/
src
/
strings.cl
diff --git
a/src/strings.cl
b/src/strings.cl
index 0d1844e301eb05eb4fc4931e3ee0e25d8e032ff8..95fdadf3289e1f0d3e3b83433d34a842d663c4d8 100644
(file)
--- a/
src/strings.cl
+++ b/
src/strings.cl
@@
-1,4
+1,4
@@
-;;;; -*- Mode:
LISP
; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; -*- Mode:
ANSI-Lisp
; Syntax: ANSI-Common-Lisp; Base: 10 -*-
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
@@
-7,7
+7,7
@@
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Feb 2002
;;;;
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Feb 2002
;;;;
-;;;; $Id: strings.cl,v 1.
5 2002/03/14 21:03:12
kevin Exp $
+;;;; $Id: strings.cl,v 1.
6 2002/03/17 17:33:30
kevin Exp $
;;;;
;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
;;;;
;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
@@
-23,7
+23,7
@@
(def-constant +null-cstring-pointer+
#+cmu nil
#+allegro 0
(def-constant +null-cstring-pointer+
#+cmu nil
#+allegro 0
- #+lispworks (fli:make-pointer :address 0 :type
:char
))
+ #+lispworks (fli:make-pointer :address 0 :type
'(:unsigned :char)
))
(defmacro convert-from-cstring (obj)
"Converts a string from a c-call. Same as convert-from-foreign-string, except
(defmacro convert-from-cstring (obj)
"Converts a string from a c-call. Same as convert-from-foreign-string, except
@@
-46,14
+46,12
@@
that CMU automatically converts strings from c-calls."
(defmacro convert-to-cstring (obj)
#+lispworks
`(if (null ,obj)
(defmacro convert-to-cstring (obj)
#+lispworks
`(if (null ,obj)
- +null-cstring-pointer+
- (fli:make-pointer
- :address (fli:pointer-address (fli:convert-to-foreign-string ,obj))
- :type :char))
+ +null-cstring-pointer+
+ (fli:convert-to-foreign-string ,obj))
#+allegro
`(if (null ,obj)
#+allegro
`(if (null ,obj)
-
0
-
(values (excl:string-to-native ,obj)))
+ 0
+ (values (excl:string-to-native ,obj)))
#+cmu
(declare (ignore obj))
)
#+cmu
(declare (ignore obj))
)
@@
-98,9
+96,7
@@
that CMU automatically converts strings from c-calls."
#+lispworks
`(if (null ,obj)
+null-cstring-pointer+
#+lispworks
`(if (null ,obj)
+null-cstring-pointer+
- (fli:make-pointer
- :address (fli:pointer-address (fli:convert-to-foreign-string ,obj))
- :type :char))
+ (fli:convert-to-foreign-string ,obj))
#+allegro
`(if (null ,obj)
0
#+allegro
`(if (null ,obj)
0
@@
-122,7
+118,7
@@
that CMU automatically converts strings from c-calls."
)
)
-(defmacro allocate-foreign-string (size &key (unsigned
nil
))
+(defmacro allocate-foreign-string (size &key (unsigned
t
))
#+cmu
(let ((array-def (gensym)))
`(let ((,array-def (list 'alien:array 'c-call:char ,size)))
#+cmu
(let ((array-def (gensym)))
`(let ((,array-def (list 'alien:array 'c-call:char ,size)))