X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fcorman%2Fgetenv-ccl.lisp;h=966e0f7b0cb34bb5772ff576a8e524b3d065015b;hb=ffdc4f04a2775d3df75088de0d50134c23917e5c;hp=4c98e7339e635961c89c4eeac01496578118c9bb;hpb=6857c87b747c4d9816788432672280160d1df773;p=uffi.git diff --git a/src/corman/getenv-ccl.lisp b/src/corman/getenv-ccl.lisp index 4c98e73..966e0f7 100644 --- a/src/corman/getenv-ccl.lisp +++ b/src/corman/getenv-ccl.lisp @@ -7,15 +7,13 @@ ;;;; Programmer: "Joe Marshall" ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id$ -;;;; ;;;; ************************************************************************* (in-package :cl-user) (ct:defun-dll c-getenv ((lpname LPSTR) - (lpbuffer LPSTR) - (nsize LPDWORD)) + (lpbuffer LPSTR) + (nsize LPDWORD)) :library-name "kernel32.dll" :return-type DWORD :entry-name "GetEnvironmentVariableA" @@ -29,7 +27,7 @@ (let* ((needed-size (c-getenv cname buffer nsizebuf)) (buffer1 (ct:malloc (1+ needed-size)))) (setf (ct:cref lpdword nsizebuf 0) needed-size) - (prog1 (if (zerop (c-getenv cname buffer1 nsizebuf)) + (prog1 (if (zerop (c-getenv cname buffer1 nsizebuf)) nil (ct:c-string-to-lisp-string buffer1)) (ct:free buffer1) @@ -53,7 +51,7 @@ (t (error "HOST must be a string, list of strings, NIL or :unspecific")))) ;| -(uffi:def-function ("getenv" c-getenv) +(uffi:def-function ("getenv" c-getenv) ((name :cstring)) :returning :cstring) @@ -62,11 +60,11 @@ (check-type key string) (uffi:with-cstring (key-native key) (uffi:convert-from-cstring (c-getenv key-native)))) - + #examples-uffi (progn (flet ((print-results (str) - (format t "~&(getenv ~S) => ~S" str (my-getenv str)))) + (format t "~&(getenv ~S) => ~S" str (my-getenv str)))) (print-results "USER") (print-results "_FOO_"))) @@ -75,7 +73,7 @@ (progn (util.test:test (my-getenv "_FOO_") nil :fail-info "Error retrieving non-existent getenv") (util.test:test (and (stringp (my-getenv "USER")) - (< 0 (length (my-getenv "USER")))) - t :fail-info "Error retrieving getenv") + (< 0 (length (my-getenv "USER")))) + t :fail-info "Error retrieving getenv") )