technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Removed the unsafe nxt_memchr() wrapper for memchr(3).

Browse Source 
The casts are unnecessary, since memchr(3)'s argument is 'const void *'.
It might have been necessary in the times of K&R, where 'void *' didn't
exist.  Nowadays, it's unnecessary, and _very_ unsafe, since casts can
hide all classes of bugs by silencing most compiler warnings.

The changes from nxt_memchr() to memchr(3) were scripted:

$ find src/ -type f \
  | grep '\.[ch]$' \
  | xargs sed -i 's/nxt_memchr/memchr/'

Reviewed-by: Andrew Clayton <a.clayton@nginx.com>
Signed-off-by: Alejandro Colomar <alx@nginx.com>
This commit is contained in:
Alejandro Colomar
2022-11-02 21:45:40 +01:00
parent 1b05161107
commit ebf02266a2
10 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nxt_sockaddr.c
View File

@@ -653,7 +653,7 @@ nxt_sockaddr_inet6_parse(nxt_mp_t *mp, nxt_str_t *addr)
length = addr->length - 1;
start = addr->start + 1;
end = nxt_memchr(start, ']', length);
end = memchr(start, ']', length);
if (nxt_slow_path(end == NULL)) {
return NULL;
}
@@ -723,7 +723,7 @@ nxt_sockaddr_inet_parse(nxt_mp_t *mp, nxt_str_t *addr)
in_addr_t inaddr;
nxt_sockaddr_t *sa;
p = nxt_memchr(addr->start, ':', addr->length);
p = memchr(addr->start, ':', addr->length);
if (p == NULL) {
length = addr->length;
@@ -964,11 +964,11 @@ nxt_inet6_probe(nxt_str_t *str)
{
u_char *colon, *end;
colon = nxt_memchr(str->start, ':', str->length);
colon = memchr(str->start, ':', str->length);
if (colon != NULL) {
end = str->start + str->length;
colon = nxt_memchr(colon + 1, ':', end - (colon + 1));
colon = memchr(colon + 1, ':', end - (colon + 1));
}
return (colon != NULL);