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

SonarCloud: fix up some bogus warnings and sprinkle const

Browse Source
pull/846/head
Brad House 6 months ago
parent 0e4b735a10
commit 8d155a18ce
7 changed files with 52 additions and 55 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. 57
      src/lib/ares__socket.c
  2. 6
      src/lib/ares_process.c
  3. 2
      src/lib/dsa/ares__array.c
  4. 6
      src/lib/record/ares_dns_multistring.c
  5. 6
      src/lib/record/ares_dns_name.c
  6. 10
      src/lib/record/ares_dns_record.c
  7. 20
      src/lib/util/ares__iface_ips.c

57
src/lib/ares__socket.c
Unescape View File

@ -159,37 +159,35 @@ static ares_status_t ares__conn_set_sockaddr(const ares_conn_t *conn,
const ares_server_t *server = conn->server;
unsigned short port =
conn->flags & ARES_CONN_FLAG_TCP ? server->tcp_port : server->udp_port;
struct sockaddr_in *sin;
struct sockaddr_in6 *sin6;
switch (server->addr.family) {
case AF_INET:
{
struct sockaddr_in *sin = (struct sockaddr_in *)(void *)sa;
if (*salen < (ares_socklen_t)sizeof(*sin)) {
return ARES_EFORMERR;
}
*salen = sizeof(*sin);
memset(sin, 0, sizeof(*sin));
sin->sin_family = AF_INET;
sin->sin_port = htons(port);
memcpy(&sin->sin_addr, &server->addr.addr.addr4, sizeof(sin->sin_addr));
sin = (struct sockaddr_in *)(void *)sa;
if (*salen < (ares_socklen_t)sizeof(*sin)) {
return ARES_EFORMERR;
}
*salen = sizeof(*sin);
memset(sin, 0, sizeof(*sin));
sin->sin_family = AF_INET;
sin->sin_port = htons(port);
memcpy(&sin->sin_addr, &server->addr.addr.addr4, sizeof(sin->sin_addr));
return ARES_SUCCESS;
case AF_INET6:
{
struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)(void *)sa;
if (*salen < (ares_socklen_t)sizeof(*sin6)) {
return ARES_EFORMERR;
}
*salen = sizeof(*sin6);
memset(sin6, 0, sizeof(*sin6));
sin6->sin6_family = AF_INET6;
sin6->sin6_port = htons(port);
memcpy(&sin6->sin6_addr, &server->addr.addr.addr6,
sizeof(sin6->sin6_addr));
sin6 = (struct sockaddr_in6 *)(void *)sa;
if (*salen < (ares_socklen_t)sizeof(*sin6)) {
return ARES_EFORMERR;
}
*salen = sizeof(*sin6);
memset(sin6, 0, sizeof(*sin6));
sin6->sin6_family = AF_INET6;
sin6->sin6_port = htons(port);
memcpy(&sin6->sin6_addr, &server->addr.addr.addr6,
sizeof(sin6->sin6_addr));
#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
sin6->sin6_scope_id = server->ll_scope;
sin6->sin6_scope_id = server->ll_scope;
#endif
}
return ARES_SUCCESS;
default:
break;
@ -453,15 +451,14 @@ static ares_status_t configure_socket(ares_conn_t *conn)
}
#endif
if (conn->flags & ARES_CONN_FLAG_TFO) {
#if defined(TFO_CLIENT_SOCKOPT)
if (setsockopt(conn->fd, IPPROTO_TCP, TFO_CLIENT_SOCKOPT, (void *)&opt,
sizeof(opt)) != 0) {
/* Disable TFO if flag can't be set. */
conn->flags &= ~((unsigned int)ARES_CONN_FLAG_TFO);
}
#endif
if (conn->flags & ARES_CONN_FLAG_TFO &&
setsockopt(conn->fd, IPPROTO_TCP, TFO_CLIENT_SOCKOPT, (void *)&opt,
sizeof(opt)) != 0 ) {
/* Disable TFO if flag can't be set. */
conn->flags &= ~((unsigned int)ARES_CONN_FLAG_TFO);
}
#endif
}
return ARES_SUCCESS;

6
src/lib/ares_process.c
Unescape View File

@ -935,9 +935,9 @@ static size_t ares__calc_query_timeout(const ares_query_t *query,
return timeplus;
}
static ares_conn_t *ares__fetch_connection(ares_channel_t *channel,
ares_server_t *server,
const ares_query_t *query)
static ares_conn_t *ares__fetch_connection(const ares_channel_t *channel,
ares_server_t *server,
const ares_query_t *query)
{
ares__llist_node_t *node;
ares_conn_t *conn;

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

@ -118,7 +118,7 @@ static ares_status_t ares__array_move(ares__array_t *arr, size_t dest_idx,
size_t src_idx)
{
void *dest_ptr;
void *src_ptr;
const void *src_ptr;
size_t nmembers;
if (arr == NULL || dest_idx >= arr->alloc_cnt || src_idx >= arr->alloc_cnt) {

6
src/lib/record/ares_dns_multistring.c
Unescape View File

@ -165,13 +165,13 @@ const unsigned char *
ares__dns_multistring_get(const ares__dns_multistring_t *strs, size_t idx,
size_t *len)
{
multistring_data_t *data;
const multistring_data_t *data;
if (strs == NULL || len == NULL) {
return NULL;
}
data = ares__array_at(strs->strs, idx);
data = ares__array_at_const(strs->strs, idx);
if (data == NULL) {
return NULL;
}
@ -206,7 +206,7 @@ const unsigned char *
buf = ares__buf_create();
for (i = 0; i < ares__array_len(strs->strs); i++) {
multistring_data_t *data = ares__array_at(strs->strs, i);
const multistring_data_t *data = ares__array_at_const(strs->strs, i);
if (data == NULL ||
ares__buf_append(buf, data->data, data->len) != ARES_SUCCESS) {
ares__buf_destroy(buf);

6
src/lib/record/ares_dns_name.c
Unescape View File

@ -324,8 +324,8 @@ static ares_status_t ares_split_dns_name(ares__array_t *labels,
/* Scan to make sure label lengths are valid */
for (i = 0; i < ares__array_len(labels); i++) {
ares__buf_t *buf = ares_dns_labels_get_at(labels, i);
size_t len = ares__buf_len(buf);
const ares__buf_t *buf = ares_dns_labels_get_at(labels, i);
size_t len = ares__buf_len(buf);
/* No 0-length labels, and no labels over 63 bytes */
if (len == 0 || len > 63) {
status = ARES_EBADNAME;
@ -394,7 +394,7 @@ ares_status_t ares__dns_name_write(ares__buf_t *buf, ares__llist_t **list,
for (i = 0; i < ares__array_len(labels); i++) {
size_t len = 0;
ares__buf_t *lbuf = ares_dns_labels_get_at(labels, i);
const ares__buf_t *lbuf = ares_dns_labels_get_at(labels, i);
const unsigned char *ptr = ares__buf_peek(lbuf, &len);
status = ares__buf_append_byte(buf, (unsigned char)(len & 0xFF));

10
src/lib/record/ares_dns_record.c
Unescape View File

@ -1422,10 +1422,10 @@ ares_status_t ares_dns_rr_del_opt_byid(ares_dns_rr_t *dns_rr,
ares_dns_rr_key_t key,
unsigned short opt)
{
ares__array_t **options;
ares__dns_optval_t *optptr;
size_t idx;
size_t cnt;
ares__array_t **options;
const ares__dns_optval_t *optptr;
size_t idx;
size_t cnt;
if (ares_dns_rr_key_datatype(key) != ARES_DATATYPE_OPT) {
return ARES_EFORMERR;
@ -1443,7 +1443,7 @@ ares_status_t ares_dns_rr_del_opt_byid(ares_dns_rr_t *dns_rr,
cnt = ares__array_len(*options);
for (idx = 0; idx < cnt; idx++) {
optptr = ares__array_at(*options, idx);
optptr = ares__array_at_const(*options, idx);
if (optptr == NULL) {
return ARES_ENOTFOUND;
}

20
src/lib/util/ares__iface_ips.c
Unescape View File

@ -220,13 +220,13 @@ size_t ares__iface_ips_cnt(const ares__iface_ips_t *ips)
const char *ares__iface_ips_get_name(const ares__iface_ips_t *ips, size_t idx)
{
ares__iface_ip_t *ip;
const ares__iface_ip_t *ip;
if (ips == NULL) {
return NULL;
}
ip = ares__array_at(ips->ips, idx);
ip = ares__array_at_const(ips->ips, idx);
if (ip == NULL) {
return NULL;
}
@ -237,13 +237,13 @@ const char *ares__iface_ips_get_name(const ares__iface_ips_t *ips, size_t idx)
const struct ares_addr *ares__iface_ips_get_addr(const ares__iface_ips_t *ips,
size_t idx)
{
ares__iface_ip_t *ip;
const ares__iface_ip_t *ip;
if (ips == NULL) {
return NULL;
}
ip = ares__array_at(ips->ips, idx);
ip = ares__array_at_const(ips->ips, idx);
if (ip == NULL) {
return NULL;
}
@ -254,13 +254,13 @@ const struct ares_addr *ares__iface_ips_get_addr(const ares__iface_ips_t *ips,
ares__iface_ip_flags_t ares__iface_ips_get_flags(const ares__iface_ips_t *ips,
size_t idx)
{
ares__iface_ip_t *ip;
const ares__iface_ip_t *ip;
if (ips == NULL) {
return 0;
}
ip = ares__array_at(ips->ips, idx);
ip = ares__array_at_const(ips->ips, idx);
if (ip == NULL) {
return 0;
}
@ -271,13 +271,13 @@ ares__iface_ip_flags_t ares__iface_ips_get_flags(const ares__iface_ips_t *ips,
unsigned char ares__iface_ips_get_netmask(const ares__iface_ips_t *ips,
size_t idx)
{
ares__iface_ip_t *ip;
const ares__iface_ip_t *ip;
if (ips == NULL) {
return 0;
}
ip = ares__array_at(ips->ips, idx);
ip = ares__array_at_const(ips->ips, idx);
if (ip == NULL) {
return 0;
}
@ -288,13 +288,13 @@ unsigned char ares__iface_ips_get_netmask(const ares__iface_ips_t *ips,
unsigned int ares__iface_ips_get_ll_scope(const ares__iface_ips_t *ips,
size_t idx)
{
ares__iface_ip_t *ip;
const ares__iface_ip_t *ip;
if (ips == NULL) {
return 0;
}
ip = ares__array_at(ips->ips, idx);
ip = ares__array_at_const(ips->ips, idx);
if (ip == NULL) {
return 0;
}

Write Preview
Loading…
Cancel
Save