generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am e163cb28: am f69139e1: Merge "Remove stray log line."

Browse Source 
* commit 'e163cb28b9b89f315000c1c480ee0cb2b3c26744':
  Remove stray log line.
This commit is contained in:
Narayan Kamath
2015-02-10 16:51:44 +00:00
committed by Android Git Automerger
parent e66b2780a7 e163cb28b9
commit 1771006863
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libc/bionic/__poll_chk.cpp
View File

@@ -30,10 +30,7 @@
#include <poll.h> #include <poll.h>
#include "private/libc_logging.h" #include "private/libc_logging.h"
#include <stdio.h>
extern "C" int __poll_chk(struct pollfd* fds, nfds_t fd_count, int timeout, size_t fds_size) { extern "C" int __poll_chk(struct pollfd* fds, nfds_t fd_count, int timeout, size_t fds_size) {
fprintf(stderr, "__poll_chk %p %i %i %i\n", fds, (int)fd_count, timeout, (int) fds_size);
if (__predict_false(fds_size / sizeof(*fds) < fd_count)) { if (__predict_false(fds_size / sizeof(*fds) < fd_count)) {
__fortify_chk_fail("poll: pollfd array smaller than fd count", 0); __fortify_chk_fail("poll: pollfd array smaller than fd count", 0);
} }
@@ -41,7 +38,6 @@ fprintf(stderr, "__poll_chk %p %i %i %i\n", fds, (int)fd_count, timeout, (int) f
} }
extern "C" int __ppoll_chk(struct pollfd* fds, nfds_t fd_count, const struct timespec* timeout, const sigset_t* mask, size_t fds_size) { extern "C" int __ppoll_chk(struct pollfd* fds, nfds_t fd_count, const struct timespec* timeout, const sigset_t* mask, size_t fds_size) {
fprintf(stderr, "__ppoll_chk %p %i %p %p %i\n", fds, (int)fd_count, timeout, mask, (int) fds_size);
if (__predict_false(fds_size / sizeof(*fds) < fd_count)) { if (__predict_false(fds_size / sizeof(*fds) < fd_count)) {
__fortify_chk_fail("ppoll: pollfd array smaller than fd count", 0); __fortify_chk_fail("ppoll: pollfd array smaller than fd count", 0);
} }