Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

solid: unreference context object after monitor in UDev backend

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-07-05 00:31:15 +03:00
parent 851fbf668e
commit 6167b1d3e3
3 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
solid/solid/backends/udev/udevbutton.cpp
View file

@ -35,7 +35,6 @@ Button::Button(UDevDevice* device)
Button::~Button()
{
}
bool Button::hasState() const

3
solid/solid/backends/udev/udevdevice.cpp
View file

@ -35,9 +35,10 @@
#include "udevnetworkinterface.h"
#include "udevbutton.h"
#include "udevmanager.h"
#include "cpuinfo.h"
#include "../shared/pciidstables.h"
#include "../shared/usbidstables.h"
#include "cpuinfo.h"
#include "kglobal.h"
#include "klocale.h"

24
solid/solid/backends/udev/udevqtclient.cpp
View file

@ -27,8 +27,7 @@ Client::Client(const QStringList& subsystems, QObject *parent)
{
// create a listener
m_monitor = udev_monitor_new_from_netlink(m_udev, "udev");
if (!m_monitor) {
if (Q_UNLIKELY(!m_monitor)) {
qWarning("UdevQt: unable to create udev monitor connection");
return;
}
@ -46,11 +45,11 @@ Client::Client(const QStringList& subsystems, QObject *parent)
Client::~Client()
{
udev_unref(m_udev);
delete m_monitorNotifier;
if (m_monitor)
if (m_monitor) {
udev_monitor_unref(m_monitor);
}
udev_unref(m_udev);
}
DeviceList Client::allDevices()
@ -66,9 +65,9 @@ DeviceList Client::allDevices()
struct udev_device *ud = udev_device_new_from_syspath(udev_enumerate_get_udev(en),
udev_list_entry_get_name(entry));
if (!ud)
if (!ud) {
continue;
}
ret << Device(ud, false);
}
@ -80,10 +79,9 @@ DeviceList Client::allDevices()
Device Client::deviceBySysfsPath(const QString &sysfsPath)
{
struct udev_device *ud = udev_device_new_from_syspath(m_udev, sysfsPath.toLatin1().constData());
if (!ud)
if (!ud) {
return Device();
}
return Device(ud, false);
}
@ -95,9 +93,9 @@ void Client::monitorReadyRead(int fd)
struct udev_device *dev = udev_monitor_receive_device(m_monitor);
m_monitorNotifier->setEnabled(true);
if (!dev)
if (!dev) {
return;
}
Device device(dev, false);
QByteArray action(udev_device_get_action(dev));
@ -115,7 +113,7 @@ void Client::monitorReadyRead(int fd)
bind/unbind are driver changing for device type of event, on some systems it appears to be
broken and doing it all the time thus ignore the actions
*/
} else if (action != "bind" && action != "unbind") {
} else if (Q_UNLIKELY(action != "bind" && action != "unbind")) {
qWarning("UdevQt: unhandled device action \"%s\"", action.constData());
}
}