From 9c9598296881ec35c80a0b0eef6f73b7538675e1 Mon Sep 17 00:00:00 2001 From: Brad House Date: Mon, 9 Sep 2024 11:59:00 -0400 Subject: [PATCH] clang-format: reformat recent code changes Lets make sure code stays in the proper format Signed-off-by: Brad House (@bradh352) --- src/lib/ares_conn.c | 5 ++--- src/lib/ares_conn.h | 7 +++---- src/lib/ares_private.h | 6 +++--- src/lib/ares_process.c | 14 ++++++-------- src/lib/ares_query.c | 3 ++- src/lib/ares_search.c | 4 ++-- src/lib/ares_send.c | 3 +-- src/lib/ares_socket.c | 4 ++-- src/lib/ares_socket.h | 4 ++-- src/lib/dsa/ares_slist.c | 2 +- src/lib/dsa/ares_slist.h | 2 +- test/ares-test.h | 19 +++++++++---------- 12 files changed, 34 insertions(+), 39 deletions(-) diff --git a/src/lib/ares_conn.c b/src/lib/ares_conn.c index b63e07c7..f02e816d 100644 --- a/src/lib/ares_conn.c +++ b/src/lib/ares_conn.c @@ -314,9 +314,9 @@ done: return status; } -static ares_status_t ares_conn_connect(ares_conn_t *conn, +static ares_status_t ares_conn_connect(ares_conn_t *conn, const struct sockaddr *sa, - ares_socklen_t salen) + ares_socklen_t salen) { ares_conn_err_t err; @@ -503,4 +503,3 @@ ares_conn_t *ares_conn_from_fd(const ares_channel_t *channel, ares_socket_t fd) return ares_llist_node_val(node); } - diff --git a/src/lib/ares_conn.h b/src/lib/ares_conn.h index 1625f161..16ecefdd 100644 --- a/src/lib/ares_conn.h +++ b/src/lib/ares_conn.h @@ -178,10 +178,9 @@ ares_conn_err_t ares_conn_write(ares_conn_t *conn, const void *data, size_t len, ares_status_t ares_conn_flush(ares_conn_t *conn); ares_conn_err_t ares_conn_read(ares_conn_t *conn, void *data, size_t len, size_t *read_bytes); -ares_conn_t *ares_conn_from_fd(const ares_channel_t *channel, - ares_socket_t fd); -void ares_conn_sock_state_cb_update(ares_conn_t *conn, - ares_conn_state_flags_t flags); +ares_conn_t *ares_conn_from_fd(const ares_channel_t *channel, ares_socket_t fd); +void ares_conn_sock_state_cb_update(ares_conn_t *conn, + ares_conn_state_flags_t flags); ares_conn_err_t ares_socket_recv(ares_channel_t *channel, ares_socket_t s, ares_bool_t is_tcp, void *data, size_t data_len, size_t *read_bytes); diff --git a/src/lib/ares_private.h b/src/lib/ares_private.h index 00b25ae4..4b4550a1 100644 --- a/src/lib/ares_private.h +++ b/src/lib/ares_private.h @@ -312,7 +312,8 @@ struct ares_channeldata { ares_bool_t ares_is_onion_domain(const char *name); /* Returns one of the normal ares status codes like ARES_SUCCESS */ -ares_status_t ares_send_query(ares_server_t *requested_server /* Optional */, ares_query_t *query, const ares_timeval_t *now); +ares_status_t ares_send_query(ares_server_t *requested_server /* Optional */, + ares_query_t *query, const ares_timeval_t *now); ares_status_t ares_requeue_query(ares_query_t *query, const ares_timeval_t *now, ares_status_t status, ares_bool_t inc_try_count, @@ -495,8 +496,7 @@ typedef enum { /* Similar to ares_send_dnsrec() except does not take a channel lock, allows * specifying a particular server to use, and also flags controlling behavior. */ -ares_status_t ares_send_nolock(ares_channel_t *channel, - ares_server_t *server, +ares_status_t ares_send_nolock(ares_channel_t *channel, ares_server_t *server, ares_send_flags_t flags, const ares_dns_record_t *dnsrec, ares_callback_dnsrec callback, void *arg, diff --git a/src/lib/ares_process.c b/src/lib/ares_process.c index e6ddbd99..03a71b25 100644 --- a/src/lib/ares_process.c +++ b/src/lib/ares_process.c @@ -192,9 +192,9 @@ static ares_status_t ares_process_fds_nolock(ares_channel_t *channel, const ares_fd_events_t *events, size_t nevents, unsigned int flags) { - ares_timeval_t now; - size_t i; - ares_status_t status = ARES_SUCCESS; + ares_timeval_t now; + size_t i; + ares_status_t status = ARES_SUCCESS; if (channel == NULL || (events == NULL && nevents != 0)) { return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */ @@ -920,7 +920,7 @@ static void ares_probe_failed_server(ares_channel_t *channel, const ares_server_t *server, const ares_query_t *query) { - const ares_server_t *last_server = ares_slist_last_val(channel->servers); + const ares_server_t *last_server = ares_slist_last_val(channel->servers); unsigned short r; ares_timeval_t now; ares_slist_node_t *node; @@ -968,9 +968,8 @@ static void ares_probe_failed_server(ares_channel_t *channel, * use the server in question */ probe_server->probe_pending = ARES_TRUE; ares_send_nolock(channel, probe_server, - ARES_SEND_FLAG_NOCACHE|ARES_SEND_FLAG_NORETRY, + ARES_SEND_FLAG_NOCACHE | ARES_SEND_FLAG_NORETRY, query->query, server_probe_cb, NULL, NULL); - } static size_t ares_calc_query_timeout(const ares_query_t *query, @@ -1100,8 +1099,7 @@ static ares_status_t ares_conn_query_write(ares_conn_t *conn, } ares_status_t ares_send_query(ares_server_t *requested_server, - ares_query_t *query, - const ares_timeval_t *now) + ares_query_t *query, const ares_timeval_t *now) { ares_channel_t *channel = query->channel; ares_server_t *server; diff --git a/src/lib/ares_query.c b/src/lib/ares_query.c index b6ca7b51..ca3b6a9b 100644 --- a/src/lib/ares_query.c +++ b/src/lib/ares_query.c @@ -105,7 +105,8 @@ ares_status_t ares_query_nolock(ares_channel_t *channel, const char *name, qquery->arg = arg; /* Send it off. qcallback will be called when we get an answer. */ - status = ares_send_nolock(channel, NULL, 0, dnsrec, ares_query_dnsrec_cb, qquery, qid); + status = ares_send_nolock(channel, NULL, 0, dnsrec, ares_query_dnsrec_cb, + qquery, qid); ares_dns_record_destroy(dnsrec); return status; diff --git a/src/lib/ares_search.c b/src/lib/ares_search.c index dda2a317..17bfb31c 100644 --- a/src/lib/ares_search.c +++ b/src/lib/ares_search.c @@ -92,8 +92,8 @@ static ares_status_t ares_search_next(ares_channel_t *channel, return status; } - status = - ares_send_nolock(channel, NULL, 0, squery->dnsrec, search_callback, squery, NULL); + status = ares_send_nolock(channel, NULL, 0, squery->dnsrec, search_callback, + squery, NULL); if (status != ARES_EFORMERR) { *skip_cleanup = ARES_TRUE; diff --git a/src/lib/ares_send.c b/src/lib/ares_send.c index 2ae46ed0..ca178a17 100644 --- a/src/lib/ares_send.c +++ b/src/lib/ares_send.c @@ -105,8 +105,7 @@ done: return status; } -ares_status_t ares_send_nolock(ares_channel_t *channel, - ares_server_t *server, +ares_status_t ares_send_nolock(ares_channel_t *channel, ares_server_t *server, ares_send_flags_t flags, const ares_dns_record_t *dnsrec, ares_callback_dnsrec callback, void *arg, diff --git a/src/lib/ares_socket.c b/src/lib/ares_socket.c index bfad7f39..a84315f0 100644 --- a/src/lib/ares_socket.c +++ b/src/lib/ares_socket.c @@ -292,9 +292,9 @@ ares_conn_err_t ares_socket_write(ares_channel_t *channel, ares_socket_t fd, ares_conn_err_t ares_socket_write_tfo(ares_channel_t *channel, ares_socket_t fd, const void *data, size_t len, - size_t *written, + size_t *written, const struct sockaddr *sa, - ares_socklen_t salen) + ares_socklen_t salen) { ares_conn_err_t err; diff --git a/src/lib/ares_socket.h b/src/lib/ares_socket.h index 4aa28f53..2145ec22 100644 --- a/src/lib/ares_socket.h +++ b/src/lib/ares_socket.h @@ -74,7 +74,7 @@ ares_conn_err_t ares_socket_write(ares_channel_t *channel, ares_socket_t fd, size_t *written); ares_conn_err_t ares_socket_write_tfo(ares_channel_t *channel, ares_socket_t fd, const void *data, size_t len, - size_t *written, + size_t *written, const struct sockaddr *sa, - ares_socklen_t salen); + ares_socklen_t salen); #endif diff --git a/src/lib/dsa/ares_slist.c b/src/lib/dsa/ares_slist.c index 398bbc59..0011a339 100644 --- a/src/lib/dsa/ares_slist.c +++ b/src/lib/dsa/ares_slist.c @@ -318,7 +318,7 @@ void ares_slist_node_reinsert(ares_slist_node_t *node) } ares_slist_node_t *ares_slist_node_find(const ares_slist_t *list, - const void *val) + const void *val) { size_t i; ares_slist_node_t *node = NULL; diff --git a/src/lib/dsa/ares_slist.h b/src/lib/dsa/ares_slist.h index 2783cc70..8ace85a7 100644 --- a/src/lib/dsa/ares_slist.h +++ b/src/lib/dsa/ares_slist.h @@ -136,7 +136,7 @@ ares_slist_node_t *ares_slist_node_prev(const ares_slist_node_t *node); * \return SkipList Node Object or NULL if not found */ ares_slist_node_t *ares_slist_node_find(const ares_slist_t *list, - const void *val); + const void *val); /*! Fetch Node Value diff --git a/test/ares-test.h b/test/ares-test.h index 8044b590..68d3c23e 100644 --- a/test/ares-test.h +++ b/test/ares-test.h @@ -769,16 +769,15 @@ int RunInContainer(ContainerFilesystem *fs, const std::string &hostname, int ICLASS_NAME(casename, testname)::InnerTestBody() - /* Derived from googletest/include/gtest/gtest-param-test.h, specifically the * TEST_P() macro, and some fixes to try to be compatible with different * versions. */ -#ifndef GTEST_ATTRIBUTE_UNUSED_ -# define GTEST_ATTRIBUTE_UNUSED_ -#endif -#ifndef GTEST_INTERNAL_ATTRIBUTE_MAYBE_UNUSED -# define GTEST_INTERNAL_ATTRIBUTE_MAYBE_UNUSED -#endif +# ifndef GTEST_ATTRIBUTE_UNUSED_ +# define GTEST_ATTRIBUTE_UNUSED_ +# endif +# ifndef GTEST_INTERNAL_ATTRIBUTE_MAYBE_UNUSED +# define GTEST_INTERNAL_ATTRIBUTE_MAYBE_UNUSED +# endif # define CONTAINED_TEST_P(test_suite_name, test_name, hostname, domainname, \ files) \ class GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) \ @@ -792,9 +791,9 @@ int RunInContainer(ContainerFilesystem *fs, const std::string &hostname, { \ ContainerFilesystem chroot(files, ".."); \ VoidToIntFn fn = [this](void) -> int { \ - ares_reinit(this->channel_); \ - ares_sleep_time(100); \ - return this->InnerTestBody(); \ + ares_reinit(this->channel_); \ + ares_sleep_time(100); \ + return this->InnerTestBody(); \ }; \ EXPECT_EQ(0, RunInContainer(&chroot, hostname, domainname, fn)); \ } \