oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

event/TimerEvent: rename IsActive() to IsPending()

This commit is contained in:
Max Kellermann 2020-12-02 15:40:28 +01:00
parent 33ba190bec
commit 9d6b5e2ba1
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/StateFile.cxx
View File

@ -148,7 +148,7 @@ try {
void void
StateFile::CheckModified() noexcept StateFile::CheckModified() noexcept
{ {
if (!timer_event.IsActive() && IsModified()) if (!timer_event.IsPending() && IsModified())
timer_event.Schedule(config.interval); timer_event.Schedule(config.interval);
} }

2
src/event/TimerEvent.hxx
View File

@ -59,7 +59,7 @@ public:
return loop; return loop;
} }
bool IsActive() const noexcept { bool IsPending() const noexcept {
return is_linked(); return is_linked();
} }

4
src/lib/nfs/Connection.cxx
View File

@ -395,7 +395,7 @@ NfsConnection::DestroyContext() noexcept
#endif #endif
if (!mount_finished) { if (!mount_finished) {
assert(mount_timeout_event.IsActive()); assert(mount_timeout_event.IsPending());
mount_timeout_event.Cancel(); mount_timeout_event.Cancel();
} }
@ -552,7 +552,7 @@ NfsConnection::MountCallback(int status, [[maybe_unused]] nfs_context *nfs,
mount_finished = true; mount_finished = true;
assert(mount_timeout_event.IsActive() || in_destroy); assert(mount_timeout_event.IsPending() || in_destroy);
mount_timeout_event.Cancel(); mount_timeout_event.Cancel();
if (status < 0) { if (status < 0) {