[ROSAPPS] Fix GCC8 warnings

This commit is contained in:
Victor Perevertkin 2019-11-06 11:54:24 +03:00
parent f7afca0973
commit 97d937add1
11 changed files with 53 additions and 42 deletions

View file

@ -49,7 +49,7 @@ void CConfig::Default()
try {
lpsStr = _strdup(dcfgDefaultResource);
DefaultResources.Insert(lpsStr);
} catch (bad_alloc e) {
} catch (bad_alloc&) {
free((void *)lpsStr);
Clear();
throw;

View file

@ -461,22 +461,22 @@ VOID CHttpDaemonThread::Execute()
case HTTPD_START: {
if (Daemon->GetState() == hsStopped)
Daemon->Start();
break;
break;
}
case HTTPD_STOP: {
if (Daemon->GetState() == hsRunning)
Daemon->Stop();
break;
break;
}
case HTTPD_SUSPEND: {
if (Daemon->GetState() == hsRunning){}
// FIXME: Suspend service
break;
break;
}
case HTTPD_RESUME: {
if (Daemon->GetState() != hsSuspended){}
// FIXME: Resume service
break;
break;
}
default:
DispatchMessage(&Msg);
@ -486,7 +486,7 @@ VOID CHttpDaemonThread::Execute()
delete Daemon;
} catch (ESocket e) {
ReportErrorStr(e.what());
} catch (bad_alloc e) {
} catch (bad_alloc&) {
ReportErrorStr(TS("Insufficient resources."));
}
}

View file

@ -45,7 +45,7 @@ VOID Run()
if (pConfiguration != NULL)
delete pConfiguration;
} catch (bad_alloc e) {
} catch (bad_alloc&) {
if (pConfiguration != NULL)
delete pConfiguration;
ReportErrorStr(TS("Insufficient resources."));