aboutsummaryrefslogtreecommitdiff
path: root/src/dbus
diff options
context:
space:
mode:
authorJiacheng Guo <gjc@google.com>2021-01-20 02:43:56 +0800
committerGitHub <noreply@github.com>2021-01-19 10:43:56 -0800
commit4e59c4cb1bd99c24b836eec80fb9593add844570 (patch)
treee67013c4524c332bd97902303b0b14d56ccf6864 /src/dbus
parent8445d1c59aa724e2a42ebb293daf0cb2ea1cd460 (diff)
downloadot-br-posix-4e59c4cb1bd99c24b836eec80fb9593add844570.tar.gz
[dbus] use recommended dbus dispatch style (#677)
Diffstat (limited to 'src/dbus')
-rw-r--r--src/dbus/server/dbus_agent.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dbus/server/dbus_agent.cpp b/src/dbus/server/dbus_agent.cpp
index f1535aa5..3fd52204 100644
--- a/src/dbus/server/dbus_agent.cpp
+++ b/src/dbus/server/dbus_agent.cpp
@@ -27,6 +27,7 @@
*/
#include "dbus/server/dbus_agent.hpp"
+
#include "common/logging.hpp"
#include "dbus/common/constants.hpp"
@@ -124,7 +125,7 @@ void DBusAgent::UpdateFdSet(fd_set & aReadFdSet,
FD_SET(fd, &aReadFdSet);
}
- if ((flags & DBUS_WATCH_WRITABLE) && dbus_connection_has_messages_to_send(mConnection.get()))
+ if ((flags & DBUS_WATCH_WRITABLE))
{
FD_SET(fd, &aWriteFdSet);
}
@@ -178,8 +179,7 @@ void DBusAgent::Process(const fd_set &aReadFdSet, const fd_set &aWriteFdSet, con
dbus_watch_handle(watch, flags);
}
- while (DBUS_DISPATCH_DATA_REMAINS == dbus_connection_get_dispatch_status(mConnection.get()) &&
- dbus_connection_read_write_dispatch(mConnection.get(), 0))
+ while (DBUS_DISPATCH_DATA_REMAINS == dbus_connection_dispatch(mConnection.get()))
;
}