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
Fixed print_message() when out of memory.
[nssm.git]
/
service.cpp
diff --git
a/service.cpp
b/service.cpp
index
177ac15
..
aff8cbb
100644
(file)
--- a/
service.cpp
+++ b/
service.cpp
@@
-90,7
+90,7
@@
int pre_install_service(int argc, TCHAR **argv) {
if (argc < 2) return nssm_gui(IDD_INSTALL, service);
\r
\r
if (! service) {
\r
if (argc < 2) return nssm_gui(IDD_INSTALL, service);
\r
\r
if (! service) {
\r
- print_message(stderr, NSSM_
EVENT
_OUT_OF_MEMORY, _T("service"), _T("pre_install_service()"));
\r
+ print_message(stderr, NSSM_
MESSAGE
_OUT_OF_MEMORY, _T("service"), _T("pre_install_service()"));
\r
return 1;
\r
}
\r
_sntprintf_s(service->exe, _countof(service->exe), _TRUNCATE, _T("%s"), argv[1]);
\r
return 1;
\r
}
\r
_sntprintf_s(service->exe, _countof(service->exe), _TRUNCATE, _T("%s"), argv[1]);
\r
@@
-155,7
+155,7
@@
int pre_edit_service(int argc, TCHAR **argv) {
if (error == ERROR_INSUFFICIENT_BUFFER) {
\r
qsc = (QUERY_SERVICE_CONFIG *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufsize);
\r
if (! qsc) {
\r
if (error == ERROR_INSUFFICIENT_BUFFER) {
\r
qsc = (QUERY_SERVICE_CONFIG *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufsize);
\r
if (! qsc) {
\r
- print_message(stderr, NSSM_
EVENT
_OUT_OF_MEMORY, _T("QUERY_SERVICE_CONFIG"), _T("pre_edit_service()"), 0);
\r
+ print_message(stderr, NSSM_
MESSAGE
_OUT_OF_MEMORY, _T("QUERY_SERVICE_CONFIG"), _T("pre_edit_service()"), 0);
\r
return 4;
\r
}
\r
}
\r
return 4;
\r
}
\r
}
\r
@@
-199,7
+199,7
@@
int pre_edit_service(int argc, TCHAR **argv) {
HeapFree(GetProcessHeap(), 0, qsc);
\r
CloseHandle(service->handle);
\r
CloseServiceHandle(services);
\r
HeapFree(GetProcessHeap(), 0, qsc);
\r
CloseHandle(service->handle);
\r
CloseServiceHandle(services);
\r
- print_message(stderr, NSSM_
EVENT
_OUT_OF_MEMORY, _T("username"), _T("pre_edit_service()"));
\r
+ print_message(stderr, NSSM_
MESSAGE
_OUT_OF_MEMORY, _T("username"), _T("pre_edit_service()"));
\r
return 4;
\r
}
\r
}
\r
return 4;
\r
}
\r
}
\r
@@
-222,7
+222,7
@@
int pre_edit_service(int argc, TCHAR **argv) {
if (! info) {
\r
CloseHandle(service->handle);
\r
CloseServiceHandle(services);
\r
if (! info) {
\r
CloseHandle(service->handle);
\r
CloseServiceHandle(services);
\r
- print_message(stderr, NSSM_
EVENT
_OUT_OF_MEMORY, _T("SERVICE_DELAYED_AUTO_START_INFO"), _T("pre_edit_service()"));
\r
+ print_message(stderr, NSSM_
MESSAGE
_OUT_OF_MEMORY, _T("SERVICE_DELAYED_AUTO_START_INFO"), _T("pre_edit_service()"));
\r
return 5;
\r
}
\r
\r
return 5;
\r
}
\r
\r
@@
-254,7
+254,7
@@
int pre_edit_service(int argc, TCHAR **argv) {
if (! description) {
\r
CloseHandle(service->handle);
\r
CloseServiceHandle(services);
\r
if (! description) {
\r
CloseHandle(service->handle);
\r
CloseServiceHandle(services);
\r
- print_message(stderr, NSSM_
EVENT
_OUT_OF_MEMORY, _T("SERVICE_CONFIG_DESCRIPTION"), _T("pre_edit_service()"));
\r
+ print_message(stderr, NSSM_
MESSAGE
_OUT_OF_MEMORY, _T("SERVICE_CONFIG_DESCRIPTION"), _T("pre_edit_service()"));
\r
return 6;
\r
}
\r
\r
return 6;
\r
}
\r
\r