From 1cd5461a5375207602f2cbdfd9a50a9b751cb7c8 Mon Sep 17 00:00:00 2001 From: Trutz Behn Date: Wed, 3 Jun 2015 19:27:01 +0200 Subject: Use namespace-safe macro, param and variable names --- include/poll.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'include/poll.h') diff --git a/include/poll.h b/include/poll.h index 6ca08a7..d9b602c 100644 --- a/include/poll.h +++ b/include/poll.h @@ -27,25 +27,25 @@ extern "C" { #undef poll -fortify_fn(poll) int poll(struct pollfd *fds, nfds_t nfds, int timeout) +_FORTIFY_FN(poll) int poll(struct pollfd *__f, nfds_t __n, int __s) { - __typeof__(sizeof 0) bos = __builtin_object_size(fds, 0); + __typeof__(sizeof 0) __b = __builtin_object_size(__f, 0); - if (nfds > bos / sizeof(struct pollfd)) + if (__n > __b / sizeof(struct pollfd)) __builtin_trap(); - return __orig_poll(fds, nfds, timeout); + return __orig_poll(__f, __n, __s); } #ifdef _GNU_SOURCE #undef ppoll -fortify_fn(ppoll) int ppoll(struct pollfd *fds, nfds_t nfds, const struct timespec *timeout, - const sigset_t *mask) +_FORTIFY_FN(ppoll) int ppoll(struct pollfd *__f, nfds_t __n, const struct timespec *__s, + const sigset_t *__m) { - __typeof__(sizeof 0) bos = __builtin_object_size(fds, 0); + __typeof__(sizeof 0) __b = __builtin_object_size(__f, 0); - if (nfds > bos / sizeof(struct pollfd)) + if (__n > __b / sizeof(struct pollfd)) __builtin_trap(); - return __orig_ppoll(fds, nfds, timeout, mask); + return __orig_ppoll(__f, __n, __s, __m); } #endif -- cgit v1.3