Skip to content

Commit b22aeac

Browse files
committed
Avoid casting volatile void* to void*
1 parent 70966e3 commit b22aeac

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

system/lib/libc/musl/src/internal/pthread_impl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ static inline void __futexwait(volatile void *addr, int val, int priv)
198198
{
199199
#ifdef __EMSCRIPTEN__
200200
(void)priv;
201-
emscripten_futex_wait((void*)addr, val, INFINITY);
201+
emscripten_futex_wait(addr, val, INFINITY);
202202
#else
203203
if (priv) priv = FUTEX_PRIVATE;
204204
__syscall(SYS_futex, addr, FUTEX_WAIT|priv, val, 0) != -ENOSYS ||

system/lib/libc/musl/src/thread/__timedwait.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ int __timedwait_cp(volatile int *addr, int val,
8181
}
8282
if (waitMsecs > maxMsecsSliceToSleep)
8383
waitMsecs = maxMsecsSliceToSleep;
84-
r = -emscripten_futex_wait((void*)addr, val, waitMsecs);
84+
r = -emscripten_futex_wait(addr, val, waitMsecs);
8585
} while(r == ETIMEDOUT);
8686
} else {
8787
// Can wait in one go.
88-
r = -emscripten_futex_wait((void*)addr, val, msecsToSleep);
88+
r = -emscripten_futex_wait(addr, val, msecsToSleep);
8989
}
9090
#else
9191
r = -__futex4_cp(addr, FUTEX_WAIT|priv, val, top);

system/lib/libc/musl/src/thread/__wait.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ void __wait(volatile int *addr, volatile int *waiters, int val, int priv)
2929
}
3030
// Assist other threads by executing proxied operations that are effectively singlethreaded.
3131
if (is_main_thread) emscripten_main_thread_process_queued_calls();
32-
e = emscripten_futex_wait((void*)addr, val, maxMsecsSliceToSleep);
32+
e = emscripten_futex_wait(addr, val, maxMsecsSliceToSleep);
3333
} while(e == -ETIMEDOUT);
3434
} else {
3535
// Can wait in one go.
36-
emscripten_futex_wait((void*)addr, val, INFINITY);
36+
emscripten_futex_wait(addr, val, INFINITY);
3737
}
3838
}
3939
#else

0 commit comments

Comments
 (0)