cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wrong udata type in wxFileSystemWatcher code under NetBSD

Browse Source 
NetBSD kqueue struct uses "intptr_t" as type of the user data pointer
and not "void*" as all the other platforms using kqueue, so account for
it in this code.

Closes https://github.com/wxWidgets/wxWidgets/pull/885

Closes #18199.
This commit is contained in:
Vadim Zeitlin 2018-08-16 19:34:41 +02:00
parent 65eb827c18
commit 5442edbbe9
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/unix/fswatcher_kqueue.cpp
View File

@ -29,6 +29,21 @@
#include "wx/private/fswatcher.h" #include "wx/private/fswatcher.h"
namespace
{
// NetBSD is different as it uses intptr_t as type of kevent struct udata field
// for some reason, instead of "void*" as all the other platforms using kqueue.
#ifdef __NetBSD__
inline intptr_t ToUdata(void* d) { return reinterpret_cast<intptr_t>(d); }
inline void* FromUdata(intptr_t d) { return reinterpret_cast<void*>(d); }
#else
inline void* ToUdata(void* d) { return d; }
inline void* FromUdata(void* d) { return d; }
#endif
} // anonymous namespace
// ============================================================================ // ============================================================================
// wxFSWSourceHandler helper class // wxFSWSourceHandler helper class
// ============================================================================ // ============================================================================
@ -126,7 +141,7 @@ public:
int action = EV_ADD | EV_ENABLE | EV_CLEAR | EV_ERROR; int action = EV_ADD | EV_ENABLE | EV_CLEAR | EV_ERROR;
int flags = Watcher2NativeFlags(watch->GetFlags()); int flags = Watcher2NativeFlags(watch->GetFlags());
EV_SET( &event, watch->GetFileDescriptor(), EVFILT_VNODE, action, EV_SET( &event, watch->GetFileDescriptor(), EVFILT_VNODE, action,
flags, 0, watch.get() ); flags, 0, ToUdata(watch.get()) );
// TODO more error conditions according to man // TODO more error conditions according to man
// TODO best deal with the error here // TODO best deal with the error here
@ -277,14 +292,16 @@ protected:
void ProcessNativeEvent(const struct kevent& e) void ProcessNativeEvent(const struct kevent& e)
{ {
wxASSERT_MSG(e.udata, "Null user data associated with kevent!"); void* const udata = FromUdata(e.udata);
wxASSERT_MSG(udata, "Null user data associated with kevent!");
wxLogTrace(wxTRACE_FSWATCHER, "Event: ident=%llu, filter=%d, flags=%u, " wxLogTrace(wxTRACE_FSWATCHER, "Event: ident=%llu, filter=%d, flags=%u, "
"fflags=%u, data=%lld, user_data=%lp", "fflags=%u, data=%lld, user_data=%lp",
e.ident, e.filter, e.flags, e.fflags, e.data, e.udata); e.ident, e.filter, e.flags, e.fflags, e.data, udata);
// for ease of use // for ease of use
wxFSWatchEntryKq& w = *(static_cast<wxFSWatchEntry*>(e.udata)); wxFSWatchEntryKq& w = *(static_cast<wxFSWatchEntry*>(udata));
int nflags = e.fflags; int nflags = e.fflags;
// clear ignored flags // clear ignored flags