yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Explicitly cast major() and minor() to uints

Browse source 
On FreeBSD, the major() and the minor() macros return ints instead of
uints.
This commit is contained in:
Vlad Zahorodnii 2021-04-27 12:02:38 +03:00
parent ba0e18955b
commit d7e9c717af
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/session_consolekit.cpp
View file

@ -171,7 +171,8 @@ int ConsoleKitSession::openRestricted(const QString &fileName)
QDBusMessage message = QDBusMessage::createMethodCall(s_serviceName, m_sessionPath, QDBusMessage message = QDBusMessage::createMethodCall(s_serviceName, m_sessionPath,
s_sessionInterface, s_sessionInterface,
QStringLiteral("TakeDevice")); QStringLiteral("TakeDevice"));
message.setArguments({ major(st.st_rdev), minor(st.st_rdev) }); // major() and minor() macros return ints on FreeBSD instead of uints.
message.setArguments({uint(major(st.st_rdev)), uint(minor(st.st_rdev))});
const QDBusMessage reply = QDBusConnection::systemBus().call(message); const QDBusMessage reply = QDBusConnection::systemBus().call(message);
if (reply.type() == QDBusMessage::ErrorMessage) { if (reply.type() == QDBusMessage::ErrorMessage) {
@ -199,7 +200,8 @@ void ConsoleKitSession::closeRestricted(int fileDescriptor)
QDBusMessage message = QDBusMessage::createMethodCall(s_serviceName, m_sessionPath, QDBusMessage message = QDBusMessage::createMethodCall(s_serviceName, m_sessionPath,
s_sessionInterface, s_sessionInterface,
QStringLiteral("ReleaseDevice")); QStringLiteral("ReleaseDevice"));
message.setArguments({ major(st.st_rdev), minor(st.st_rdev) }); // major() and minor() macros return ints on FreeBSD instead of uints.
message.setArguments({uint(major(st.st_rdev)), uint(minor(st.st_rdev))});
QDBusConnection::systemBus().asyncCall(message); QDBusConnection::systemBus().asyncCall(message);

6
src/session_logind.cpp
View file

@ -177,7 +177,8 @@ int LogindSession::openRestricted(const QString &fileName)
QDBusMessage message = QDBusMessage::createMethodCall(s_serviceName, m_sessionPath, QDBusMessage message = QDBusMessage::createMethodCall(s_serviceName, m_sessionPath,
s_sessionInterface, s_sessionInterface,
QStringLiteral("TakeDevice")); QStringLiteral("TakeDevice"));
message.setArguments({ major(st.st_rdev), minor(st.st_rdev) }); // major() and minor() macros return ints on FreeBSD instead of uints.
message.setArguments({uint(major(st.st_rdev)), uint(minor(st.st_rdev))});
const QDBusMessage reply = QDBusConnection::systemBus().call(message); const QDBusMessage reply = QDBusConnection::systemBus().call(message);
if (reply.type() == QDBusMessage::ErrorMessage) { if (reply.type() == QDBusMessage::ErrorMessage) {
@ -205,7 +206,8 @@ void LogindSession::closeRestricted(int fileDescriptor)
QDBusMessage message = QDBusMessage::createMethodCall(s_serviceName, m_sessionPath, QDBusMessage message = QDBusMessage::createMethodCall(s_serviceName, m_sessionPath,
s_sessionInterface, s_sessionInterface,
QStringLiteral("ReleaseDevice")); QStringLiteral("ReleaseDevice"));
message.setArguments({ major(st.st_rdev), minor(st.st_rdev) }); // major() and minor() macros return ints on FreeBSD instead of uints.
message.setArguments({uint(major(st.st_rdev)), uint(minor(st.st_rdev))});
QDBusConnection::systemBus().asyncCall(message); QDBusConnection::systemBus().asyncCall(message);