ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

services: Remove loop that's not really used anymore (Coverity).

This commit is contained in:
Nikolay Sivov 2014-04-19 13:55:21 +04:00 committed by Alexandre Julliard
parent 62502d0670
commit fdbd8ffffc
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
programs/services/services.c
View File

@ -695,32 +695,29 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE *
static DWORD service_wait_for_startup(struct service_entry *service_entry, HANDLE process_handle) static DWORD service_wait_for_startup(struct service_entry *service_entry, HANDLE process_handle)
{ {
HANDLE handles[2] = { service_entry->status_changed_event, process_handle };
DWORD state, ret;
WINE_TRACE("%p\n", service_entry); WINE_TRACE("%p\n", service_entry);
for (;;)
{
DWORD dwCurrentStatus;
HANDLE handles[2] = { service_entry->status_changed_event, process_handle };
DWORD ret;
ret = WaitForMultipleObjects( 2, handles, FALSE, service_pipe_timeout ); ret = WaitForMultipleObjects( 2, handles, FALSE, service_pipe_timeout );
if (ret != WAIT_OBJECT_0) if (ret != WAIT_OBJECT_0)
return ERROR_SERVICE_REQUEST_TIMEOUT; return ERROR_SERVICE_REQUEST_TIMEOUT;
service_lock_shared(service_entry); service_lock_shared(service_entry);
dwCurrentStatus = service_entry->status.dwCurrentState; state = service_entry->status.dwCurrentState;
service_unlock(service_entry); service_unlock(service_entry);
if (dwCurrentStatus == SERVICE_START_PENDING) if (state == SERVICE_START_PENDING)
{ {
WINE_TRACE("Service changed its status to SERVICE_START_PENDING\n"); WINE_TRACE("Service state changed to SERVICE_START_PENDING\n");
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
else if (dwCurrentStatus == SERVICE_RUNNING) else if (state == SERVICE_RUNNING)
{ {
WINE_TRACE("Service started successfully\n"); WINE_TRACE("Service started successfully\n");
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
return ERROR_SERVICE_REQUEST_TIMEOUT; return ERROR_SERVICE_REQUEST_TIMEOUT;
}
} }
/****************************************************************************** /******************************************************************************