From c143884fdf03ec3a8b7a89c88baa477f8629395c Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 27 Jun 2013 21:54:43 +0200 Subject: [PATCH] Use incorrect use of BPathMonitor in input/midi/net server The B_ENTRY_* constants aren't valid watch flags. --- src/servers/input/AddOnManager.cpp | 5 ++--- src/servers/midi/DeviceWatcher.cpp | 5 ++--- src/servers/net/NetServer.cpp | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/servers/input/AddOnManager.cpp b/src/servers/input/AddOnManager.cpp index dd27ac02c8..971605f70b 100644 --- a/src/servers/input/AddOnManager.cpp +++ b/src/servers/input/AddOnManager.cpp @@ -217,9 +217,8 @@ AddOnManager::StartMonitoringDevice(DeviceAddOn* addOn, const char* device) bool newPath; status_t status = _AddDevicePath(addOn, path.String(), newPath); if (status == B_OK && newPath) { - status = BPathMonitor::StartWatching(path.String(), B_ENTRY_CREATED - | B_ENTRY_REMOVED | B_ENTRY_MOVED | B_WATCH_FILES_ONLY - | B_WATCH_RECURSIVELY, this); + status = BPathMonitor::StartWatching(path.String(), + B_WATCH_FILES_ONLY | B_WATCH_RECURSIVELY, this); if (status != B_OK) { bool lastPath; _RemoveDevicePath(addOn, path.String(), lastPath); diff --git a/src/servers/midi/DeviceWatcher.cpp b/src/servers/midi/DeviceWatcher.cpp index e59118b325..f1ec1c59ac 100644 --- a/src/servers/midi/DeviceWatcher.cpp +++ b/src/servers/midi/DeviceWatcher.cpp @@ -127,9 +127,8 @@ DeviceWatcher::Start() "Initial devices scan", B_NORMAL_PRIORITY, this)); // And watch for any change - return BPathMonitor::StartWatching(kDevicesRoot, B_ENTRY_CREATED - | B_ENTRY_REMOVED | B_ENTRY_MOVED | B_WATCH_FILES_ONLY - | B_WATCH_RECURSIVELY, this); + return BPathMonitor::StartWatching(kDevicesRoot, + B_WATCH_FILES_ONLY | B_WATCH_RECURSIVELY, this); } diff --git a/src/servers/net/NetServer.cpp b/src/servers/net/NetServer.cpp index 4935e2cb10..7feb428b09 100644 --- a/src/servers/net/NetServer.cpp +++ b/src/servers/net/NetServer.cpp @@ -250,8 +250,8 @@ NetServer::ReadyToRun() _BringUpInterfaces(); _StartServices(); - BPrivate::BPathMonitor::StartWatching("/dev/net", B_ENTRY_CREATED - | B_ENTRY_REMOVED | B_WATCH_FILES_ONLY | B_WATCH_RECURSIVELY, this); + BPrivate::BPathMonitor::StartWatching("/dev/net", + B_WATCH_FILES_ONLY | B_WATCH_RECURSIVELY, this); }