Removed the unsafe nxt_memcmp() wrapper for memcmp(3).
The casts are unnecessary, since memcmp(3)'s arguments are '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_memcmp() to memcmp(3) were scripted: $ find src/ -type f \ | grep '\.[ch]$' \ | xargs sed -i 's/nxt_memcmp/memcmp/' Reviewed-by: Andrew Clayton <a.clayton@nginx.com> Signed-off-by: Alejandro Colomar <alx@nginx.com>
This commit is contained in:
@@ -382,7 +382,7 @@ nxt_sockaddr_cmp(nxt_sockaddr_t *sa1, nxt_sockaddr_t *sa2)
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (nxt_memcmp(&sa1->u.sockaddr_in6.sin6_addr,
|
||||
if (memcmp(&sa1->u.sockaddr_in6.sin6_addr,
|
||||
&sa2->u.sockaddr_in6.sin6_addr, 16)
|
||||
!= 0)
|
||||
{
|
||||
@@ -401,7 +401,7 @@ nxt_sockaddr_cmp(nxt_sockaddr_t *sa1, nxt_sockaddr_t *sa2)
|
||||
|
||||
length = sa1->socklen - offsetof(struct sockaddr_un, sun_path);
|
||||
|
||||
if (nxt_memcmp(&sa1->u.sockaddr_un.sun_path,
|
||||
if (memcmp(&sa1->u.sockaddr_un.sun_path,
|
||||
&sa2->u.sockaddr_un.sun_path, length)
|
||||
!= 0)
|
||||
{
|
||||
@@ -550,7 +550,7 @@ nxt_sockaddr_parse_optport(nxt_mp_t *mp, nxt_str_t *addr)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (addr->length > 6 && nxt_memcmp(addr->start, "unix:", 5) == 0) {
|
||||
if (addr->length > 6 && memcmp(addr->start, "unix:", 5) == 0) {
|
||||
sa = nxt_sockaddr_unix_parse(mp, addr);
|
||||
|
||||
} else if (addr->start[0] == '[' || nxt_inet6_probe(addr)) {
|
||||
|
||||
Reference in New Issue
Block a user