diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2018-06-25 16:51:47 +0300 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2018-06-25 16:51:47 +0300 |
| commit | 1a52d876f7e10d07f58deee6faeaf70a11a6110f (patch) | |
| tree | f69ba903180b3deac3bba2ee7acda9d34f18d73c /src/nxt_listen_socket.c | |
| parent | af31012815e20f0c92ed6ea803638a16ba47b0c2 (diff) | |
| download | unit-1a52d876f7e10d07f58deee6faeaf70a11a6110f.tar.gz unit-1a52d876f7e10d07f58deee6faeaf70a11a6110f.tar.bz2 | |
Introduced nxt_length() macro.
Diffstat (limited to 'src/nxt_listen_socket.c')
| -rw-r--r-- | src/nxt_listen_socket.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nxt_listen_socket.c b/src/nxt_listen_socket.c index a99bc630..0d283c37 100644 --- a/src/nxt_listen_socket.c +++ b/src/nxt_listen_socket.c @@ -200,7 +200,7 @@ nxt_listen_socket_remote_size(nxt_listen_socket_t *ls) * comment in nxt_socket.h. */ ls->socklen = offsetof(struct sockaddr_un, sun_path) + 1; - ls->address_length = sizeof("unix:") - 1; + ls->address_length = nxt_length("unix:"); break; @@ -239,7 +239,7 @@ nxt_listen_socket_pool_min_size(nxt_listen_socket_t *ls) ls->address_length = NXT_INET6_ADDR_STR_LEN; size = offsetof(nxt_sockaddr_t, u) + sizeof(struct sockaddr_in6) - + NXT_INET6_ADDR_STR_LEN + (sizeof(":65535") - 1); + + NXT_INET6_ADDR_STR_LEN + nxt_length(":65535"); if (IN6_IS_ADDR_UNSPECIFIED(&ls->sockaddr->u.sockaddr_in6.sin6_addr)) { size += offsetof(nxt_sockaddr_t, u) + sizeof(struct sockaddr_in6); @@ -259,8 +259,8 @@ nxt_listen_socket_pool_min_size(nxt_listen_socket_t *ls) * sizeof(struct sockaddr_un), see comment in nxt_socket.h. */ ls->socklen = 3; - size = ls->socklen + sizeof("unix:") - 1; - ls->address_length = sizeof("unix:") - 1; + size = ls->socklen + nxt_length("unix:"); + ls->address_length = nxt_length("unix:"); break; @@ -271,7 +271,7 @@ nxt_listen_socket_pool_min_size(nxt_listen_socket_t *ls) ls->address_length = NXT_INET_ADDR_STR_LEN; size = offsetof(nxt_sockaddr_t, u) + sizeof(struct sockaddr_in) - + NXT_INET_ADDR_STR_LEN + (sizeof(":65535") - 1); + + NXT_INET_ADDR_STR_LEN + nxt_length(":65535"); if (ls->sockaddr->u.sockaddr_in.sin_addr.s_addr == INADDR_ANY) { size += offsetof(nxt_sockaddr_t, u) + sizeof(struct sockaddr_in); |
