Renamed set_environment().

The set_environment() function was poorly named.  It gets the
environment settings from the registry but doesn't actually set any
variables.  It is more appropriately named get_environment().

diff --git a/registry.cpp b/registry.cpp
index c794ed1..50f6dc3 100644 (file)
--- a/registry.cpp
+++ b/registry.cpp
@@ -175,7 +175,7 @@ int create_exit_action(TCHAR *service_name, const TCHAR *action_string, bool edi
   return 0;\r
 }\r
 \r
-int set_environment(TCHAR *service_name, HKEY key, TCHAR *value, TCHAR **env, unsigned long *envlen) {\r
+int get_environment(TCHAR *service_name, HKEY key, TCHAR *value, TCHAR **env, unsigned long *envlen) {\r
   unsigned long type = REG_MULTI_SZ;\r
 \r
   /* Dummy test to find buffer size */\r
@@ -205,7 +205,7 @@ int set_environment(TCHAR *service_name, HKEY key, TCHAR *value, TCHAR **env, un
   *env = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, *envlen);\r
   if (! *env) {\r
     *envlen = 0;\r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, _T("set_environment()"), 0);\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, _T("get_environment()"), 0);\r
     return 3;\r
   }\r
 \r
@@ -462,9 +462,9 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
   }\r
 \r
   /* Try to get environment variables - may fail */\r
-  set_environment(service->name, key, NSSM_REG_ENV, &service->env, &service->envlen);\r
+  get_environment(service->name, key, NSSM_REG_ENV, &service->env, &service->envlen);\r
   /* Environment variables to add to existing rather than replace - may fail. */\r
-  set_environment(service->name, key, NSSM_REG_ENV_EXTRA, &service->env_extra, &service->env_extralen);\r
+  get_environment(service->name, key, NSSM_REG_ENV_EXTRA, &service->env_extra, &service->env_extralen);\r
 \r
   if (si) {\r
     if (service->env_extra) {\r

diff --git a/registry.h b/registry.h
index 390e032..aa14e00 100644 (file)
--- a/registry.h
+++ b/registry.h
@@ -34,7 +34,7 @@ HKEY open_registry(const TCHAR *, REGSAM sam);
 int create_messages();\r
 int create_parameters(nssm_service_t *, bool);\r
 int create_exit_action(TCHAR *, const TCHAR *, bool);\r
-int set_environment(TCHAR *, HKEY, TCHAR *, TCHAR **, unsigned long *);\r
+int get_environment(TCHAR *, HKEY, TCHAR *, TCHAR **, unsigned long *);\r
 int get_string(HKEY, TCHAR *, TCHAR *, unsigned long, bool, bool, bool);\r
 int get_string(HKEY, TCHAR *, TCHAR *, unsigned long, bool);\r
 int expand_parameter(HKEY, TCHAR *, TCHAR *, unsigned long, bool, bool);\r

diff --git a/settings.cpp b/settings.cpp
index c9bb32d..a3d301b 100644 (file)
--- a/settings.cpp
+++ b/settings.cpp
@@ -329,7 +329,7 @@ static int setting_get_environment(const TCHAR *service_name, void *param, const
 
   TCHAR *env = 0;
   unsigned long envlen;
-  if (set_environment((TCHAR *) service_name, key, (TCHAR *) name, &env, &envlen)) return -1;
+  if (get_environment((TCHAR *) service_name, key, (TCHAR *) name, &env, &envlen)) return -1;
   if (! envlen) return 0;
 
   TCHAR *formatted;