clang-format

pull/673/head
Brad House 1 year ago
parent 88c444d495
commit c203ace2ed
  1. 22
      src/lib/ares__buf.c
  2. 2
      src/lib/ares__buf.h
  3. 1
      src/lib/ares__htable.c
  4. 2
      src/lib/ares_str.c
  5. 12
      src/lib/ares_str.h
  6. 15
      src/lib/ares_strsplit.c

@ -793,29 +793,32 @@ static void ares__buf_destroy_cb(void *arg)
ares__buf_destroy(arg);
}
static ares_bool_t ares__buf_split_isduplicate(ares__llist_t *list,
static ares_bool_t ares__buf_split_isduplicate(ares__llist_t *list,
const unsigned char *val,
size_t len,
ares__buf_split_t flags)
size_t len,
ares__buf_split_t flags)
{
ares__llist_node_t *node;
for (node = ares__llist_node_first(list); node != NULL;
node = ares__llist_node_next(node)) {
ares__buf_t *buf = ares__llist_node_val(node);
size_t plen = 0;
const unsigned char *ptr = ares__buf_peek(buf, &plen);
ares__buf_t *buf = ares__llist_node_val(node);
size_t plen = 0;
const unsigned char *ptr = ares__buf_peek(buf, &plen);
/* Can't be duplicate if lengths mismatch */
if (plen != len)
if (plen != len) {
continue;
}
if (flags & ARES_BUF_SPLIT_CASE_INSENSITIVE) {
if (ares__memeq_ci(ptr, val, len))
if (ares__memeq_ci(ptr, val, len)) {
return ARES_TRUE;
}
} else {
if (memcmp(ptr, val, len) == 0)
if (memcmp(ptr, val, len) == 0) {
return ARES_TRUE;
}
}
}
return ARES_FALSE;
@ -856,7 +859,6 @@ ares_status_t ares__buf_split(ares__buf_t *buf, const unsigned char *delims,
if (!(flags & ARES_BUF_SPLIT_NO_DUPLICATES) ||
!ares__buf_split_isduplicate(*list, ptr, len, flags)) {
/* Since we don't allow const buffers of 0 length, and user wants
* 0-length buffers, swap what we do here */
if (len) {

@ -423,7 +423,7 @@ typedef enum {
ARES_BUF_SPLIT_ALLOW_BLANK = 1 << 1,
/*! Remove duplicate entries */
ARES_BUF_SPLIT_NO_DUPLICATES = 1 << 2,
/*! Perform case-insenstive matching when comparing values */
/*! Perform case-insensitive matching when comparing values */
ARES_BUF_SPLIT_CASE_INSENSITIVE = 1 << 3
} ares__buf_split_t;

@ -399,7 +399,6 @@ unsigned int ares__htable_hash_FNV1a(const unsigned char *key, size_t key_len,
return hv;
}
/* Case insensitive version, meant for ASCII strings */
unsigned int ares__htable_hash_FNV1a_casecmp(const unsigned char *key,
size_t key_len, unsigned int seed)

@ -144,7 +144,7 @@ ares_bool_t ares__memeq_ci(const unsigned char *ptr, const unsigned char *val,
size_t len)
{
size_t i;
for (i=0; i<len; i++) {
for (i = 0; i < len; i++) {
if (ares__tolower_lookup[ptr[i]] != ares__tolower_lookup[val[i]]) {
return ARES_FALSE;
}

@ -30,9 +30,9 @@
#include "ares_setup.h"
#include "ares.h"
char *ares_strdup(const char *s1);
char *ares_strdup(const char *s1);
size_t ares_strlen(const char *str);
size_t ares_strlen(const char *str);
/*! Copy string from source to destination with destination buffer size
* provided. The destination is guaranteed to be null terminated, if the
@ -44,12 +44,12 @@ size_t ares_strlen(const char *str);
* \param[in] dest_size Size of destination buffer
* \return String length. Will be at most dest_size-1
*/
size_t ares_strcpy(char *dest, const char *src, size_t dest_size);
size_t ares_strcpy(char *dest, const char *src, size_t dest_size);
ares_bool_t ares_str_isnum(const char *str);
ares_bool_t ares_str_isnum(const char *str);
unsigned char ares__tolower(unsigned char c);
ares_bool_t ares__memeq_ci(const unsigned char *ptr, const unsigned char *val,
size_t len);
ares_bool_t ares__memeq_ci(const unsigned char *ptr, const unsigned char *val,
size_t len);
#endif /* HEADER_CARES_STRDUP_H */

@ -71,16 +71,15 @@ char **ares__strsplit_duplicate(char **elms, size_t num_elm)
return out;
}
char **ares__strsplit(const char *in, const char *delms, size_t *num_elm)
{
ares_status_t status;
ares__buf_t *buf = NULL;
ares__llist_t *llist = NULL;
ares__llist_node_t *node;
char **out = NULL;
size_t cnt = 0;
size_t idx = 0;
char **out = NULL;
size_t cnt = 0;
size_t idx = 0;
if (in == NULL || delms == NULL || num_elm == NULL) {
return NULL;
@ -93,11 +92,9 @@ char **ares__strsplit(const char *in, const char *delms, size_t *num_elm)
return NULL;
}
status = ares__buf_split(buf, (const unsigned char *)delms,
ares_strlen(delms),
ARES_BUF_SPLIT_NO_DUPLICATES|
ARES_BUF_SPLIT_CASE_INSENSITIVE,
&llist);
status = ares__buf_split(
buf, (const unsigned char *)delms, ares_strlen(delms),
ARES_BUF_SPLIT_NO_DUPLICATES | ARES_BUF_SPLIT_CASE_INSENSITIVE, &llist);
if (status != ARES_SUCCESS) {
goto done;
}

Loading…
Cancel
Save