mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 03:46:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Fix ConfBuffer::write() result's using

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2024-10-27 17:56:18 +05:00
parent 53bb7f48ad
commit 190bb5bcc0
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tests/LogReaderTest/tst_logreader.h
View File

@ -70,10 +70,10 @@ void setConf(Device &device)
ConfBuffer confBuf; ConfBuffer confBuf;
const int confIoSize = confBuf.write(conf, nullptr, envManager); ASSERT_TRUE(confBuf.write(conf, nullptr, envManager));
ASSERT_NE(confIoSize, 0);
ASSERT_TRUE(device.ioctl(DriverCommon::ioctlSetConf(), confBuf.data(), confIoSize)); auto confData = confBuf.buffer();
ASSERT_TRUE(device.ioctl(DriverCommon::ioctlSetConf(), confData.data(), confData.size()));
} }
void printLogs(LogBuffer &buf) void printLogs(LogBuffer &buf)

5
src/tests/UtilTest/tst_confutil.h
View File

@ -69,10 +69,9 @@ TEST_F(ConfUtilTest, confWriteRead)
ConfBuffer confBuf; ConfBuffer confBuf;
const int confIoSize = confBuf.write(conf, nullptr, envManager); if (!confBuf.write(conf, nullptr, envManager)) {
if (confIoSize == 0) {
qCritical() << "Error:" << confBuf.errorMessage(); qCritical() << "Error:" << confBuf.errorMessage();
ASSERT_NE(confIoSize, 0); Q_UNREACHABLE();
} }
// Check the buffer // Check the buffer

3
src/ui/conf/confmanager.cpp
View File

@ -903,8 +903,7 @@ bool ConfManager::validateConf(const FirewallConf &newConf)
ConfBuffer confBuf; ConfBuffer confBuf;
const int confSize = confBuf.write(newConf, IoC<ConfAppManager>(), *IoC<EnvManager>()); if (!confBuf.write(newConf, IoC<ConfAppManager>(), *IoC<EnvManager>())) {
if (confSize == 0) {
qCCritical(LC) << "Conf save error:" << confBuf.errorMessage(); qCCritical(LC) << "Conf save error:" << confBuf.errorMessage();
return false; return false;
} }