- (cond
- ((uffi:null-pointer-p char-ptr)
- nil)
- (t
- (case type
- (:double
- (atof char-ptr))
- (:int
- (atol char-ptr))
- (:int32
- (atoi char-ptr))
- (:uint32
- (strtoul char-ptr))
- (:uint
- (strtoul char-ptr))
- ((:int64 :uint64)
- (uffi:with-foreign-object (high32-ptr :unsigned-int)
- (let ((low32 (atol64 char-ptr high32-ptr))
- (high32 (uffi:deref-pointer high32-ptr :unsigned-int)))
- (if (zerop high32)
- low32
- (make-64-bit-integer high32 low32)))))
- (:blob
- (if length
- (uffi:convert-from-foreign-usb8 char-ptr length)
- (error "Can't return blob since length is not specified.")))
- (t
- (uffi:convert-from-foreign-string char-ptr
- :null-terminated-p nil
- :length length
- :encoding encoding))))))
+ (unless (uffi:null-pointer-p char-ptr)
+ (case type
+ (:double (atof char-ptr))
+ (:int (atol char-ptr))
+ (:int32 (atoi char-ptr))
+ (:uint32 (strtoul char-ptr))
+ (:uint (strtoul char-ptr))
+ (:int64 (strtoll char-ptr))
+ (:uint64 (strtoull char-ptr))
+ (:blob
+ (if length
+ (uffi:convert-from-foreign-usb8 char-ptr length)
+ (error "Can't return blob since length is not specified.")))
+ (t
+ ;; NB: this used to manually expand the arg list based on if length and encoding
+ ;; were provided. If this is required the macro is aweful and should be rewritten
+ ;; to accept nil args (as it appears to)
+ (uffi:convert-from-foreign-string
+ char-ptr
+ :null-terminated-p (null length)
+ :length length
+ :encoding encoding)))))