summaryrefslogtreecommitdiff
path: root/test/testpoll.c
diff options
context:
space:
mode:
authorIvan Zhakov <ivan@apache.org>2022-11-20 07:14:38 +0000
committerIvan Zhakov <ivan@apache.org>2022-11-20 07:14:38 +0000
commit4f9b76b6f2acc4030ce9ef164322514c5d0e761b (patch)
tree9b993b3753affcbf164056826f9d568d8760b3a1 /test/testpoll.c
parent961caf5f46055483fa72ab02f5e8baa16c209e2f (diff)
downloadapr-4f9b76b6f2acc4030ce9ef164322514c5d0e761b.tar.gz
Remove trailing whitespaces in *.c.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1905414 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test/testpoll.c')
-rw-r--r--test/testpoll.c56
1 files changed, 28 insertions, 28 deletions
diff --git a/test/testpoll.c b/test/testpoll.c
index fe3520137..f22ec9253 100644
--- a/test/testpoll.c
+++ b/test/testpoll.c
@@ -47,7 +47,7 @@ static apr_pollfd_t *pollarray_large;
*/
static int default_pollset_impl = APR_POLLSET_DEFAULT;
-static void make_socket(apr_socket_t **sock, apr_sockaddr_t **sa,
+static void make_socket(apr_socket_t **sock, apr_sockaddr_t **sa,
apr_port_t port, apr_pool_t *p, abts_case *tc)
{
apr_status_t rv;
@@ -63,15 +63,15 @@ static void make_socket(apr_socket_t **sock, apr_sockaddr_t **sa,
}
#ifdef OLD_POLL_INTERFACE
-static void check_sockets(const apr_pollfd_t *pollarray,
- apr_socket_t **sockarray, int which, int pollin,
+static void check_sockets(const apr_pollfd_t *pollarray,
+ apr_socket_t **sockarray, int which, int pollin,
abts_case *tc)
{
apr_status_t rv;
apr_int16_t event;
char *str;
- rv = apr_poll_revents_get(&event, sockarray[which],
+ rv = apr_poll_revents_get(&event, sockarray[which],
(apr_pollfd_t *)pollarray);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
if (pollin) {
@@ -99,7 +99,7 @@ static void send_msg(apr_socket_t **sockarray, apr_sockaddr_t **sas, int which,
ABTS_SIZE_EQUAL(tc, strlen("hello"), len);
}
-static void recv_msg(apr_socket_t **sockarray, int which, apr_pool_t *p,
+static void recv_msg(apr_socket_t **sockarray, int which, apr_pool_t *p,
abts_case *tc)
{
apr_size_t buflen = 5;
@@ -117,7 +117,7 @@ static void recv_msg(apr_socket_t **sockarray, int which, apr_pool_t *p,
ABTS_STR_EQUAL(tc, "hello", buffer);
}
-
+
static void create_all_sockets(abts_case *tc, void *data)
{
int i;
@@ -126,7 +126,7 @@ static void create_all_sockets(abts_case *tc, void *data)
make_socket(&s[i], &sa[i], 7777 + i, p, tc);
}
}
-
+
#ifdef OLD_POLL_INTERFACE
static void setup_small_poll(abts_case *tc, void *data)
{
@@ -135,7 +135,7 @@ static void setup_small_poll(abts_case *tc, void *data)
rv = apr_poll_setup(&pollarray, SMALL_NUM_SOCKETS, p);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
-
+
for (i = 0; i < SMALL_NUM_SOCKETS;i++){
ABTS_INT_EQUAL(tc, 0, pollarray[i].reqevents);
ABTS_INT_EQUAL(tc, 0, pollarray[i].rtnevents);
@@ -153,7 +153,7 @@ static void setup_large_poll(abts_case *tc, void *data)
rv = apr_poll_setup(&pollarray_large, LARGE_NUM_SOCKETS, p);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
-
+
for (i = 0; i < LARGE_NUM_SOCKETS;i++){
ABTS_INT_EQUAL(tc, 0, pollarray_large[i].reqevents);
ABTS_INT_EQUAL(tc, 0, pollarray_large[i].rtnevents);
@@ -257,7 +257,7 @@ static void send_large_pollarray(abts_case *tc, void *data)
send_msg(s, sa, LARGE_NUM_SOCKETS - 1, tc);
- rv = apr_poll(pollarray_large, LARGE_NUM_SOCKETS, &lrv,
+ rv = apr_poll(pollarray_large, LARGE_NUM_SOCKETS, &lrv,
2 * APR_USEC_PER_SEC);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
@@ -279,7 +279,7 @@ static void recv_large_pollarray(abts_case *tc, void *data)
recv_msg(s, LARGE_NUM_SOCKETS - 1, p, tc);
- rv = apr_poll(pollarray_large, LARGE_NUM_SOCKETS, &lrv,
+ rv = apr_poll(pollarray_large, LARGE_NUM_SOCKETS, &lrv,
2 * APR_USEC_PER_SEC);
ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(rv));
@@ -350,7 +350,7 @@ static void multi_event_pollset(abts_case *tc, void *data)
rv = apr_pollset_remove(pollset, &socket_pollfd);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
}
-
+
static void add_sockets_pollset(abts_case *tc, void *data)
{
apr_status_t rv;
@@ -416,7 +416,7 @@ static void send_middle_pollset(abts_case *tc, void *data)
apr_status_t rv;
const apr_pollfd_t *descs = NULL;
int num;
-
+
send_msg(s, sa, 2, tc);
send_msg(s, sa, 5, tc);
rv = apr_pollset_poll(pollset, -1, &num, &descs);
@@ -454,7 +454,7 @@ static void send_last_pollset(abts_case *tc, void *data)
apr_status_t rv;
const apr_pollfd_t *descs = NULL;
int num;
-
+
send_msg(s, sa, LARGE_NUM_SOCKETS - 1, tc);
rv = apr_pollset_poll(pollset, -1, &num, &descs);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
@@ -546,7 +546,7 @@ static void pollset_remove(abts_case *tc, void *data)
ABTS_PTR_EQUAL(tc, s[2], hot_files[1].desc.s);
ABTS_PTR_EQUAL(tc, (void *)4, hot_files[2].client_data);
ABTS_PTR_EQUAL(tc, s[3], hot_files[2].desc.s);
-
+
/* now remove the pollset elements referring to desc s[2] */
pfd.desc.s = s[2];
pfd.client_data = (void *)999; /* not used on this call */
@@ -607,7 +607,7 @@ static void trigger_pollcb(abts_case *tc, void *data)
apr_status_t rv;
apr_pollfd_t socket_pollfd;
pollcb_baton_t pcb;
-
+
POLLCB_PREREQ;
ABTS_PTR_NOTNULL(tc, s[0]);
@@ -617,7 +617,7 @@ static void trigger_pollcb(abts_case *tc, void *data)
socket_pollfd.client_data = s[0];
rv = apr_pollcb_add(pollcb, &socket_pollfd);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
-
+
send_msg(s, sa, 0, tc);
pcb.tc = tc;
pcb.count = 0;
@@ -639,7 +639,7 @@ static void timeout_pollcb(abts_case *tc, void *data)
pcb.count = 0;
pcb.tc = tc;
- rv = apr_pollcb_poll(pollcb, 1, trigger_pollcb_cb, &pcb);
+ rv = apr_pollcb_poll(pollcb, 1, trigger_pollcb_cb, &pcb);
ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(rv));
ABTS_INT_EQUAL(tc, 0, pcb.count);
}
@@ -653,7 +653,7 @@ static void timeout_pollin_pollcb(abts_case *tc, void *data)
POLLCB_PREREQ;
recv_msg(s, 0, p, tc);
-
+
ABTS_PTR_NOTNULL(tc, s[0]);
socket_pollfd.desc_type = APR_POLL_SOCKET;
socket_pollfd.reqevents = APR_POLLIN;
@@ -661,11 +661,11 @@ static void timeout_pollin_pollcb(abts_case *tc, void *data)
socket_pollfd.client_data = s[0];
rv = apr_pollcb_add(pollcb, &socket_pollfd);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
-
+
pcb.count = 0;
pcb.tc = tc;
-
- rv = apr_pollcb_poll(pollcb, 1, trigger_pollcb_cb, &pcb);
+
+ rv = apr_pollcb_poll(pollcb, 1, trigger_pollcb_cb, &pcb);
ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(rv));
ABTS_INT_EQUAL(tc, 0, pcb.count);
@@ -688,7 +688,7 @@ static void pollset_default(abts_case *tc, void *data)
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv1);
ABTS_PTR_NOTNULL(tc, pollset);
-
+
rv1 = apr_pollset_create_ex(&pollset, 1, p, 0, APR_POLLSET_KQUEUE);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv1);
ABTS_PTR_NOTNULL(tc, pollset);
@@ -705,13 +705,13 @@ static void pollset_default(abts_case *tc, void *data)
if (rv1 == APR_SUCCESS) {
ABTS_PTR_NOTNULL(tc, pollset);
}
-
+
rv2 = apr_pollset_create_ex(&pollset, 1, p, APR_POLLSET_NODEFAULT,
APR_POLLSET_KQUEUE);
if (rv2 == APR_SUCCESS) {
ABTS_PTR_NOTNULL(tc, pollset);
}
-
+
ABTS_ASSERT(tc,
"failure using APR_POLLSET_NODEFAULT with unsupported method",
rv1 != APR_SUCCESS || rv2 != APR_SUCCESS);
@@ -736,7 +736,7 @@ static void pollcb_default(abts_case *tc, void *data)
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv1);
ABTS_PTR_NOTNULL(tc, pollcb);
-
+
rv1 = apr_pollcb_create_ex(&pollcb, 1, p, 0, APR_POLLSET_KQUEUE);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv1);
ABTS_PTR_NOTNULL(tc, pollcb);
@@ -753,13 +753,13 @@ static void pollcb_default(abts_case *tc, void *data)
if (rv1 == APR_SUCCESS) {
ABTS_PTR_NOTNULL(tc, pollcb);
}
-
+
rv2 = apr_pollcb_create_ex(&pollcb, 1, p, APR_POLLSET_NODEFAULT,
APR_POLLSET_KQUEUE);
if (rv2 == APR_SUCCESS) {
ABTS_PTR_NOTNULL(tc, pollcb);
}
-
+
ABTS_ASSERT(tc,
"failure using APR_POLLSET_NODEFAULT with unsupported method",
rv1 != APR_SUCCESS || rv2 != APR_SUCCESS);