mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Web API: fixed missing initializations of error object

pull/147/head
f4exb 2018-02-21 13:27:10 +01:00
rodzic 9f220f182c
commit 0162b1d2bc
2 zmienionych plików z 8 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
sdrgui/webapi/webapiadaptergui.cpp
Wyświetl plik

@ -779,6 +779,8 @@ int WebAPIAdapterGUI::devicesetDeviceSettingsGet(
SWGSDRangel::SWGDeviceSettings& response,
SWGSDRangel::SWGErrorResponse& error)
{
error.init();
if ((deviceSetIndex >= 0) && (deviceSetIndex < (int) m_mainWindow.m_deviceUIs.size()))
{
DeviceUISet *deviceSet = m_mainWindow.m_deviceUIs[deviceSetIndex];
@ -799,16 +801,13 @@ int WebAPIAdapterGUI::devicesetDeviceSettingsGet(
}
else
{
error.init();
*error.getMessage() = QString("DeviceSet error");
return 500;
}
}
else
{
error.init();
*error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex);
return 404;
}
}
@ -820,6 +819,8 @@ int WebAPIAdapterGUI::devicesetDeviceSettingsPutPatch(
SWGSDRangel::SWGDeviceSettings& response,
SWGSDRangel::SWGErrorResponse& error)
{
error.init();
if ((deviceSetIndex >= 0) && (deviceSetIndex < (int) m_mainWindow.m_deviceUIs.size()))
{
DeviceUISet *deviceSet = m_mainWindow.m_deviceUIs[deviceSetIndex];
@ -828,13 +829,11 @@ int WebAPIAdapterGUI::devicesetDeviceSettingsPutPatch(
{
if (response.getTx() != 0)
{
error.init();
*error.getMessage() = QString("Rx device found but Tx device requested");
return 400;
}
if (deviceSet->m_deviceSourceAPI->getHardwareId() != *response.getDeviceHwType())
{
error.init();
*error.getMessage() = QString("Device mismatch. Found %1 input").arg(deviceSet->m_deviceSourceAPI->getHardwareId());
return 400;
}
@ -848,13 +847,11 @@ int WebAPIAdapterGUI::devicesetDeviceSettingsPutPatch(
{
if (response.getTx() == 0)
{
error.init();
*error.getMessage() = QString("Tx device found but Rx device requested");
return 400;
}
else if (deviceSet->m_deviceSinkAPI->getHardwareId() != *response.getDeviceHwType())
{
error.init();
*error.getMessage() = QString("Device mismatch. Found %1 output").arg(deviceSet->m_deviceSinkAPI->getHardwareId());
return 400;
}
@ -866,14 +863,12 @@ int WebAPIAdapterGUI::devicesetDeviceSettingsPutPatch(
}
else
{
error.init();
*error.getMessage() = QString("DeviceSet error");
return 500;
}
}
else
{
error.init();
*error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex);
return 404;
}

12
sdrsrv/webapi/webapiadaptersrv.cpp
Wyświetl plik

@ -884,6 +884,8 @@ int WebAPIAdapterSrv::devicesetDeviceSettingsGet(
SWGSDRangel::SWGDeviceSettings& response,
SWGSDRangel::SWGErrorResponse& error)
{
error.init();
if ((deviceSetIndex >= 0) && (deviceSetIndex < (int) m_mainCore.m_deviceSets.size()))
{
DeviceSet *deviceSet = m_mainCore.m_deviceSets[deviceSetIndex];
@ -904,14 +906,12 @@ int WebAPIAdapterSrv::devicesetDeviceSettingsGet(
}
else
{
error.init();
*error.getMessage() = QString("DeviceSet error");
return 500;
}
}
else
{
error.init();
*error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex);
return 404;
}
@ -924,6 +924,8 @@ int WebAPIAdapterSrv::devicesetDeviceSettingsPutPatch(
SWGSDRangel::SWGDeviceSettings& response,
SWGSDRangel::SWGErrorResponse& error)
{
error.init();
if ((deviceSetIndex >= 0) && (deviceSetIndex < (int) m_mainCore.m_deviceSets.size()))
{
DeviceSet *deviceSet = m_mainCore.m_deviceSets[deviceSetIndex];
@ -932,13 +934,11 @@ int WebAPIAdapterSrv::devicesetDeviceSettingsPutPatch(
{
if (response.getTx() != 0)
{
error.init();
*error.getMessage() = QString("Rx device found but Tx device requested");
return 400;
}
if (deviceSet->m_deviceSourceAPI->getHardwareId() != *response.getDeviceHwType())
{
error.init();
*error.getMessage() = QString("Device mismatch. Found %1 input").arg(deviceSet->m_deviceSourceAPI->getHardwareId());
return 400;
}
@ -952,13 +952,11 @@ int WebAPIAdapterSrv::devicesetDeviceSettingsPutPatch(
{
if (response.getTx() == 0)
{
error.init();
*error.getMessage() = QString("Tx device found but Rx device requested");
return 400;
}
else if (deviceSet->m_deviceSinkAPI->getHardwareId() != *response.getDeviceHwType())
{
error.init();
*error.getMessage() = QString("Device mismatch. Found %1 output").arg(deviceSet->m_deviceSinkAPI->getHardwareId());
return 400;
}
@ -970,14 +968,12 @@ int WebAPIAdapterSrv::devicesetDeviceSettingsPutPatch(
}
else
{
error.init();
*error.getMessage() = QString("DeviceSet error");
return 500;
}
}
else
{
error.init();
*error.getMessage() = QString("There is no device set with index %1").arg(deviceSetIndex);
return 404;
}