From 8f17c6c0283aeb78b615580529e98f1a28bf3c77 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 29 May 2015 14:03:44 -0700 Subject: [PATCH] clang-format --- src/core/iomgr/pollset_multipoller_with_epoll.c | 5 +++-- src/core/iomgr/pollset_multipoller_with_poll_posix.c | 6 ++++-- src/core/iomgr/pollset_posix.h | 9 +++++---- .../fixtures/chttp2_simple_ssl_fullstack_with_poll.c | 6 ++++-- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/core/iomgr/pollset_multipoller_with_epoll.c b/src/core/iomgr/pollset_multipoller_with_epoll.c index 6149a297b3b..40b7935a57e 100644 --- a/src/core/iomgr/pollset_multipoller_with_epoll.c +++ b/src/core/iomgr/pollset_multipoller_with_epoll.c @@ -194,6 +194,7 @@ static void epoll_become_multipoller(grpc_pollset *pollset, grpc_fd **fds, } } -grpc_platform_become_multipoller_type grpc_platform_become_multipoller = epoll_become_multipoller; +grpc_platform_become_multipoller_type grpc_platform_become_multipoller = + epoll_become_multipoller; -#endif /* GPR_LINUX_MULTIPOLL_WITH_EPOLL */ +#endif /* GPR_LINUX_MULTIPOLL_WITH_EPOLL */ diff --git a/src/core/iomgr/pollset_multipoller_with_poll_posix.c b/src/core/iomgr/pollset_multipoller_with_poll_posix.c index 234315eaf9e..d781c9b4bbd 100644 --- a/src/core/iomgr/pollset_multipoller_with_poll_posix.c +++ b/src/core/iomgr/pollset_multipoller_with_poll_posix.c @@ -98,7 +98,8 @@ static void end_polling(grpc_pollset *pollset) { pollset_hdr *h; h = pollset->data.ptr; for (i = 1; i < h->pfd_count; i++) { - grpc_fd_end_poll(&h->watchers[i], h->pfds[i].revents & POLLIN, h->pfds[i].revents & POLLOUT); + grpc_fd_end_poll(&h->watchers[i], h->pfds[i].revents & POLLIN, + h->pfds[i].revents & POLLOUT); } } @@ -253,5 +254,6 @@ void grpc_poll_become_multipoller(grpc_pollset *pollset, grpc_fd **fds, #endif /* GPR_POSIX_SOCKET */ #ifdef GPR_POSIX_MULTIPOLL_WITH_POLL -grpc_platform_become_multipoller_type grpc_platform_become_multipoller = grpc_poll_become_multipoller; +grpc_platform_become_multipoller_type grpc_platform_become_multipoller = + grpc_poll_become_multipoller; #endif diff --git a/src/core/iomgr/pollset_posix.h b/src/core/iomgr/pollset_posix.h index 1060118a9a7..088ec910c28 100644 --- a/src/core/iomgr/pollset_posix.h +++ b/src/core/iomgr/pollset_posix.h @@ -102,10 +102,11 @@ grpc_pollset *grpc_backup_pollset(void); /* turn a pollset into a multipoller: platform specific */ typedef void (*grpc_platform_become_multipoller_type)(grpc_pollset *pollset, - struct grpc_fd **fds, size_t fd_count); + struct grpc_fd **fds, + size_t fd_count); extern grpc_platform_become_multipoller_type grpc_platform_become_multipoller; -void grpc_poll_become_multipoller(grpc_pollset *pollset, - struct grpc_fd **fds, size_t fd_count); +void grpc_poll_become_multipoller(grpc_pollset *pollset, struct grpc_fd **fds, + size_t fd_count); -#endif /* GRPC_INTERNAL_CORE_IOMGR_POLLSET_POSIX_H */ +#endif /* GRPC_INTERNAL_CORE_IOMGR_POLLSET_POSIX_H */ diff --git a/test/core/end2end/fixtures/chttp2_simple_ssl_fullstack_with_poll.c b/test/core/end2end/fixtures/chttp2_simple_ssl_fullstack_with_poll.c index bc05e53fef4..a5865d37c85 100644 --- a/test/core/end2end/fixtures/chttp2_simple_ssl_fullstack_with_poll.c +++ b/test/core/end2end/fixtures/chttp2_simple_ssl_fullstack_with_poll.c @@ -87,7 +87,8 @@ static void chttp2_init_server_secure_fullstack( } f->server = grpc_server_create(server_args); grpc_server_register_completion_queue(f->server, f->server_cq); - GPR_ASSERT(grpc_server_add_secure_http2_port(f->server, ffd->localaddr, server_creds)); + GPR_ASSERT(grpc_server_add_secure_http2_port(f->server, ffd->localaddr, + server_creds)); grpc_server_credentials_release(server_creds); grpc_server_start(f->server); } @@ -143,7 +144,8 @@ int main(int argc, char **argv) { grpc_test_init(argc, argv); /* Set the SSL roots env var. */ - roots_file = gpr_tmpfile("chttp2_simple_ssl_with_poll_fullstack_test", &roots_filename); + roots_file = gpr_tmpfile("chttp2_simple_ssl_with_poll_fullstack_test", + &roots_filename); GPR_ASSERT(roots_filename != NULL); GPR_ASSERT(roots_file != NULL); GPR_ASSERT(fwrite(test_root_cert, 1, roots_size, roots_file) == roots_size);