(finish_server): New, factored out of termination code. Fixes two
places in service_main() that lacked close_files(). (close_files, loc_NTTerm): Static linkage.
This commit is contained in:
parent
b915edd13c
commit
3f472fc729
3 changed files with 30 additions and 28 deletions
|
@ -202,13 +202,13 @@ service_main(DWORD argc, LPTSTR *argv)
|
|||
|
||||
if (service_status_handle == (SERVICE_STATUS_HANDLE)0) {
|
||||
logerror("RegisterServiceCtrlHandler failed %d\n", GetLastError());
|
||||
loc_NTTerm();
|
||||
finish_server()
|
||||
return;
|
||||
}
|
||||
|
||||
if ((hShutdownEvent = CreateEvent(NULL, TRUE, FALSE, NULL)) == NULL) {
|
||||
logerror("CreateEvent for Shutdown failed %d\n", GetLastError());
|
||||
loc_NTTerm();
|
||||
finish_server()
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -225,11 +225,8 @@ service_main(DWORD argc, LPTSTR *argv)
|
|||
|
||||
empth_exit();
|
||||
|
||||
/* We should never get here. But, just in case... */
|
||||
close_files();
|
||||
|
||||
loc_NTTerm();
|
||||
return;
|
||||
CANT_HAPPEN("main thread terminated");
|
||||
finish_server();
|
||||
}
|
||||
|
||||
void
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue