From ab382219e662686f4070933a1464a282317165b3 Mon Sep 17 00:00:00 2001 From: Stelian Ionescu Date: Sat, 5 Dec 2009 00:51:21 +0100 Subject: [PATCH] Inline %ENVAR, (SETF %ENVAR) and %REMVAR. --- src/os/os-unix.lisp | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/os/os-unix.lisp b/src/os/os-unix.lisp index 6f1f670..ed8b0a0 100644 --- a/src/os/os-unix.lisp +++ b/src/os/os-unix.lisp @@ -12,16 +12,6 @@ :initform (make-hash-table :test #'equal) :accessor environment-variables))) -(defun %envar (env name) - (gethash name (environment-variables env))) - -(defun (setf %envar) (value env name) - (setf (gethash name (environment-variables env)) - value)) - -(defun %remvar (env name) - (remhash name (environment-variables env))) - (defun environment-variable (name &key env) "ENVIRONMENT-VARIABLE returns the environment variable identified by NAME, or NIL if one does not exist. NAME can @@ -35,7 +25,7 @@ symbols or strings. Signals an error on failure." (null (isys:%sys-getenv name)) (environment - (%envar env name))))) + (gethash name (environment-variables env)))))) (defun (setf environment-variable) (value name &key env (overwrite t)) (let ((value (string value)) @@ -45,8 +35,9 @@ symbols or strings. Signals an error on failure." (isys:%sys-setenv (string name) value overwrite)) (environment (when (or overwrite - (null (nth-value 1 (%envar env name)))) - (setf (%envar env name) value))))) + (null (nth-value 1 (gethash name (environment-variables env))))) + (setf (gethash name (environment-variables env)) + value))))) value) (defun makunbound-environment-variable (name &key env) @@ -59,7 +50,7 @@ failure." (null (isys:%sys-unsetenv (string name))) (environment - (%remvar env name)))) + (remhash name (environment-variables env))))) (values name)) (defun environment () -- 2.11.4.GIT