Chiebot-Mirror
/
c-ares
mirror of https://github.com/c-ares/c-ares.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

clang-format: reformat recent code changes

Browse Source 
Lets make sure code stays in the proper format

Signed-off-by: Brad House (@bradh352)
pull/879/head
Brad House 5 months ago
parent fccfe11519
commit 9c95982968
12 changed files with 34 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/lib/ares_conn.c
  2. 7
      src/lib/ares_conn.h
  3. 6
      src/lib/ares_private.h
  4. 14
      src/lib/ares_process.c
  5. 3
      src/lib/ares_query.c
  6. 4
      src/lib/ares_search.c
  7. 3
      src/lib/ares_send.c
  8. 4
      src/lib/ares_socket.c
  9. 4
      src/lib/ares_socket.h
  10. 2
      src/lib/dsa/ares_slist.c
  11. 2
      src/lib/dsa/ares_slist.h
  12. 19
      test/ares-test.h

5
src/lib/ares_conn.c
Unescape View File

@ -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);
}

7
src/lib/ares_conn.h
Unescape View File

@ -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);

6
src/lib/ares_private.h
Unescape View File

@ -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,

14
src/lib/ares_process.c
Unescape View File

@ -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;

3
src/lib/ares_query.c
Unescape View File

@ -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;

4
src/lib/ares_search.c
Unescape View File

@ -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;

3
src/lib/ares_send.c
Unescape View File

@ -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,

4
src/lib/ares_socket.c
Unescape View File

@ -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;

4
src/lib/ares_socket.h
Unescape View File

@ -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

2
src/lib/dsa/ares_slist.c
Unescape View File

@ -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;

2
src/lib/dsa/ares_slist.h
Unescape View File

@ -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

19
test/ares-test.h vendored
Unescape View File

@ -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)); \
} \

Write Preview
Loading…
Cancel
Save