diff options
author | Andreas Baumann <abaumann@yahoo.com> | 2010-05-23 11:45:32 +0200 |
---|---|---|
committer | Andreas Baumann <abaumann@yahoo.com> | 2010-05-23 11:45:32 +0200 |
commit | 3b381609dddb8f4f9c3668681e4e475501b3f38f (patch) | |
tree | 2860cdf78ed1379d7b402eefa4b0aea2ed505f44 /src/service | |
parent | cc19486d5cc448647961918ebd73e2aced5eb803 (diff) | |
download | wolfbones-3b381609dddb8f4f9c3668681e4e475501b3f38f.tar.gz wolfbones-3b381609dddb8f4f9c3668681e4e475501b3f38f.tar.bz2 |
removed FormatMessage/Win32 macro from log.h and added a
more portable wolf_system_error_msg in errors module
Diffstat (limited to 'src/service')
-rw-r--r-- | src/service/service.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/service/service.c b/src/service/service.c index 3b30c55..e63ce11 100644 --- a/src/service/service.c +++ b/src/service/service.c @@ -54,7 +54,7 @@ wolf_error_t wolf_service_install( wolf_service_params_t params ) { SC_MANAGER_ALL_ACCESS ); if( scm == NULL ) { - WOLF_LOG_GET_LAST_ERROR( GetLastError( ), errbuf, 512 ); + wolf_system_error_msg( errbuf, 512 ); wolf_log( WOLF_LOG_ERR, WOLF_CATEGORY_SERVICE, WOLF_MSG_SERVICE_CANT_OPEN_SCM_FOR_INSTALL, _( "Unable to open the service control manager to register service '%s': %s (%d)" ), params.service_name, errbuf, GetLastError( ) ); @@ -68,7 +68,7 @@ wolf_error_t wolf_service_install( wolf_service_params_t params ) { MAX_PATH ); if( res == MAX_PATH ) { - WOLF_LOG_GET_LAST_ERROR( GetLastError( ), errbuf, 512 ); + wolf_system_error_msg( errbuf, 512 ); wolf_log( WOLF_LOG_ERR, WOLF_CATEGORY_SERVICE, WOLF_MSG_SERVICE_CANT_GET_PATH_OF_BINARY, _( "Unable to get full path of the binary of service '%s': %s (%d)" ), params.service_name, errbuf, GetLastError( ) ); @@ -93,7 +93,7 @@ wolf_error_t wolf_service_install( wolf_service_params_t params ) { NULL ); if( service == NULL ) { - WOLF_LOG_GET_LAST_ERROR( GetLastError( ), errbuf, 512 ); + wolf_system_error_msg( errbuf, 512 ); wolf_log( WOLF_LOG_ERR, WOLF_CATEGORY_SERVICE, WOLF_MSG_SERVICE_CANT_CREATE_SERVICE, _( "Unable to create service '%s': %s (%d)" ), params.service_name, errbuf, GetLastError( ) ); @@ -105,7 +105,7 @@ wolf_error_t wolf_service_install( wolf_service_params_t params ) { descr.lpDescription = (LPTSTR)params.service_description; rt = ChangeServiceConfig2( service, SERVICE_CONFIG_DESCRIPTION, &descr ); if( !rt ) { - WOLF_LOG_GET_LAST_ERROR( GetLastError( ), errbuf, 512 ); + wolf_system_error_msg( errbuf, 512 ); wolf_log( WOLF_LOG_ERR, WOLF_CATEGORY_SERVICE, WOLF_MSG_SERVICE_CANT_SET_SERVICE_DESCRIPTION, _( "Unable to set description of service '%s': %s (%d)" ), params.service_name, errbuf, GetLastError( ) ); @@ -141,7 +141,7 @@ wolf_error_t wolf_service_remove( LPCTSTR service_name ) { SC_MANAGER_ALL_ACCESS ); if( scm == NULL ) { - WOLF_LOG_GET_LAST_ERROR( GetLastError( ), errbuf, 512 ); + wolf_system_error_msg( errbuf, 512 ); wolf_log( WOLF_LOG_ERR, WOLF_CATEGORY_SERVICE, WOLF_MSG_SERVICE_CANT_OPEN_SCM_FOR_UNINSTALL, _( "Unable to open the service control manager to uninstall '%s': %s (%d)" ), service_name, errbuf, GetLastError( ) ); @@ -152,7 +152,7 @@ wolf_error_t wolf_service_remove( LPCTSTR service_name ) { service = OpenService( scm, service_name, SERVICE_ALL_ACCESS ); if( service == NULL ) { - WOLF_LOG_GET_LAST_ERROR( GetLastError( ), errbuf, 512 ); + wolf_system_error_msg( errbuf, 512 ); wolf_log( WOLF_LOG_ERR, WOLF_CATEGORY_SERVICE, WOLF_MSG_SERVICE_CANT_OPEN_SERVICE, _( "Unable to open service '%s': %s (%d)" ), service_name, errbuf, GetLastError( ) ); @@ -162,7 +162,7 @@ wolf_error_t wolf_service_remove( LPCTSTR service_name ) { res = DeleteService( service ); if( res == 0 ) { - WOLF_LOG_GET_LAST_ERROR( GetLastError( ), errbuf, 512 ); + wolf_system_error_msg( errbuf, 512 ); wolf_log( WOLF_LOG_ERR, WOLF_CATEGORY_SERVICE, WOLF_MSG_SERVICE_CANT_DELETE_SERVICE, _( "Unable to uninstall service '%s': %s (%d)" ), service_name, errbuf, GetLastError( ) ); @@ -256,7 +256,7 @@ static void wolf_service_report_status( DWORD current_state, res = SetServiceStatus( service_status_handle, &service_status ); if( !res ) { - WOLF_LOG_GET_LAST_ERROR( GetLastError( ), errbuf, 512 ); + wolf_system_error_msg( errbuf, 512 ); wolf_log( WOLF_LOG_ERR, WOLF_CATEGORY_SERVICE, WOLF_MSG_SERVICE_CANT_REPORT_STATUS, _( "Unable to report state '%s' (%d) of service '%s' to SCM '%s (%d)" ), wolf_service_state_to_str( current_state ), current_state, @@ -312,7 +312,7 @@ void WINAPI wolf_service_main( DWORD argc, LPTSTR *argv ) { SERVICE_NAME, wolf_service_ctrl_handler ); if( service_status_handle == 0 ) { - WOLF_LOG_GET_LAST_ERROR( GetLastError( ), errbuf, 512 ); + wolf_system_error_msg( errbuf, 512 ); wolf_log( WOLF_LOG_ERR, WOLF_CATEGORY_SERVICE, WOLF_MSG_SERVICE_CANT_REGISTER_SERVICE_CTRL_HANDLER, _( "Unable to register service control handler function for service '%s': %s (%d)" ), SERVICE_NAME, errbuf, GetLastError( ) ); @@ -333,7 +333,7 @@ void WINAPI wolf_service_main( DWORD argc, LPTSTR *argv ) { FALSE, /* not signalled */ NULL ); /* no name */ if( service_stop_event == NULL ) { - WOLF_LOG_GET_LAST_ERROR( GetLastError( ), errbuf, 512 ); + wolf_system_error_msg( errbuf, 512 ); wolf_log( WOLF_LOG_ERR, WOLF_CATEGORY_SERVICE, WOLF_MSG_SERVICE_CANT_CREATE_STOP_EVENT, _( "Unable to create the stop event for service '%s': %s (%d)" ), SERVICE_NAME, errbuf, GetLastError( ) ); @@ -369,7 +369,7 @@ wolf_service_event_t wolf_service_events_suspend_console( int timeout, wolf_erro return WOLF_SERVICE_NO_EVENT; default: - WOLF_LOG_GET_LAST_ERROR( GetLastError( ), errbuf, 512 ); + wolf_system_error_msg( errbuf, 512 ); wolf_log( WOLF_LOG_ERR, WOLF_CATEGORY_SERVICE, WOLF_MSG_SERVICE_WAIT_FOR_OBJECT_FAILED, _( "Waiting for events in the service '%s' failed: %s (%d)" ), SERVICE_NAME, errbuf, GetLastError( ) ); @@ -395,7 +395,7 @@ wolf_service_event_t wolf_service_events_suspend_service( int timeout, wolf_erro return WOLF_SERVICE_NO_EVENT; default: - WOLF_LOG_GET_LAST_ERROR( GetLastError( ), errbuf, 512 ); + wolf_system_error_msg( errbuf, 512 ); wolf_log( WOLF_LOG_ERR, WOLF_CATEGORY_SERVICE, WOLF_MSG_SERVICE_WAIT_FOR_OBJECT_FAILED, _( "Waiting for events in the service '%s' failed: %s (%d)" ), SERVICE_NAME, errbuf, GetLastError( ) ); @@ -457,7 +457,7 @@ wolf_error_t wolf_service_start_console( LPTSTR service_name, FALSE, /* not signalled */ NULL ); /* no name */ if( service_stop_event == NULL ) { - WOLF_LOG_GET_LAST_ERROR( GetLastError( ), errbuf, 512 ); + wolf_system_error_msg( errbuf, 512 ); wolf_log( WOLF_LOG_ERR, WOLF_CATEGORY_SERVICE, WOLF_MSG_SERVICE_CANT_CREATE_STOP_EVENT, _( "Unable to create the stop event for service '%s': %s (%d)" ), SERVICE_NAME, errbuf, GetLastError( ) ); @@ -467,7 +467,7 @@ wolf_error_t wolf_service_start_console( LPTSTR service_name, /* catch console events for proper termination of the service in console mode */ res = SetConsoleCtrlHandler( wolf_service_console_ctrl_handler, TRUE ); if( !res ) { - WOLF_LOG_GET_LAST_ERROR( GetLastError( ), errbuf, 512 ); + wolf_system_error_msg( errbuf, 512 ); wolf_log( WOLF_LOG_ERR, WOLF_CATEGORY_SERVICE, WOLF_MSG_SERVICE_CANT_REGISTER_CONSOLE_CTRL_HANDLER, _( "Unable to register the console control handler for foreground service '%s': %s (%d)" ), service_name, errbuf, GetLastError( ) ); @@ -508,7 +508,7 @@ wolf_error_t wolf_service_start( LPTSTR service_name, return WOLF_ERR_INVALID_STATE; } - WOLF_LOG_GET_LAST_ERROR( GetLastError( ), errbuf, 512 ); + wolf_system_error_msg( errbuf, 512 ); wolf_log( WOLF_LOG_ERR, WOLF_CATEGORY_SERVICE, WOLF_MSG_SERVICE_CANT_DISPATCH_SERVICE, _( "Unable to dispatch service '%s': %s (%d)" ), service_name, errbuf, GetLastError( ) ); |