git://git.iain.cx/iain
/
nssm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed set_environment().
[nssm.git]
/
registry.cpp
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
return 0;
\r
}
\r
\r
-int
s
et_environment(TCHAR *service_name, HKEY key, TCHAR *value, TCHAR **env, unsigned long *envlen) {
\r
+int
g
et_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
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
*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("
s
et_environment()"), 0);
\r
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, _T("
g
et_environment()"), 0);
\r
return 3;
\r
}
\r
\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
}
\r
\r
/* Try to get environment variables - may fail */
\r
-
s
et_environment(service->name, key, NSSM_REG_ENV, &service->env, &service->envlen);
\r
+
g
et_environment(service->name, key, NSSM_REG_ENV, &service->env, &service->envlen);
\r
/* Environment variables to add to existing rather than replace - may fail. */
\r
/* Environment variables to add to existing rather than replace - may fail. */
\r
-
s
et_environment(service->name, key, NSSM_REG_ENV_EXTRA, &service->env_extra, &service->env_extralen);
\r
+
g
et_environment(service->name, key, NSSM_REG_ENV_EXTRA, &service->env_extra, &service->env_extralen);
\r
\r
if (si) {
\r
if (service->env_extra) {
\r
\r
if (si) {
\r
if (service->env_extra) {
\r