diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/machine/machine-dbus.c | 2 | ||||
| -rw-r--r-- | src/nss-myhostname/nss-myhostname.c | 6 | ||||
| -rw-r--r-- | src/nss-mymachines/nss-mymachines.c | 4 | ||||
| -rw-r--r-- | src/nss-resolve/nss-resolve.c | 6 | ||||
| -rw-r--r-- | src/shared/in-addr-util.h | 6 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c index 72e0a701bf..daa60d11e4 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -214,7 +214,7 @@ int bus_machine_method_get_addresses(sd_bus *bus, sd_bus_message *message, void for (a = addresses, i = 0; i < n; a++, i++) { struct iovec iov[2] = { { .iov_base = &a->family, .iov_len = sizeof(a->family) }, - { .iov_base = &a->address, .iov_len = PROTO_ADDRESS_SIZE(a->family) }, + { .iov_base = &a->address, .iov_len = FAMILY_ADDRESS_SIZE(a->family) }, }; r = writev(pair[1], iov, 2); diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c index f5dadb60aa..6fa6790f52 100644 --- a/src/nss-myhostname/nss-myhostname.c +++ b/src/nss-myhostname/nss-myhostname.c @@ -195,7 +195,7 @@ static enum nss_status fill_in_hostent( assert(errnop); assert(h_errnop); - alen = PROTO_ADDRESS_SIZE(af); + alen = FAMILY_ADDRESS_SIZE(af); for (a = addresses, n = 0, c = 0; n < n_addresses; a++, n++) if (af == a->family) @@ -393,7 +393,7 @@ enum nss_status _nss_myhostname_gethostbyaddr2_r( return NSS_STATUS_UNAVAIL; } - if (len != PROTO_ADDRESS_SIZE(af)) { + if (len != FAMILY_ADDRESS_SIZE(af)) { *errnop = EINVAL; *h_errnop = NO_RECOVERY; return NSS_STATUS_UNAVAIL; @@ -428,7 +428,7 @@ enum nss_status _nss_myhostname_gethostbyaddr2_r( if (af != a->family) continue; - if (memcmp(addr, &a->address, PROTO_ADDRESS_SIZE(af)) == 0) + if (memcmp(addr, &a->address, FAMILY_ADDRESS_SIZE(af)) == 0) goto found; } diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c index eb1d2b450b..09c5d05f2e 100644 --- a/src/nss-mymachines/nss-mymachines.c +++ b/src/nss-mymachines/nss-mymachines.c @@ -173,7 +173,7 @@ enum nss_status _nss_mymachines_gethostbyname4_r( goto fail; } - if (sz != PROTO_ADDRESS_SIZE(family)) { + if (sz != FAMILY_ADDRESS_SIZE(family)) { r = -EINVAL; goto fail; } @@ -281,7 +281,7 @@ enum nss_status _nss_mymachines_gethostbyname3_r( return NSS_STATUS_NOTFOUND; } - alen = PROTO_ADDRESS_SIZE(af); + alen = FAMILY_ADDRESS_SIZE(af); l = strlen(name); ms = ALIGN(l+1) + diff --git a/src/nss-resolve/nss-resolve.c b/src/nss-resolve/nss-resolve.c index 0dbc224b5c..c67f59e179 100644 --- a/src/nss-resolve/nss-resolve.c +++ b/src/nss-resolve/nss-resolve.c @@ -207,7 +207,7 @@ enum nss_status _nss_resolve_gethostbyname4_r( if (!IN_SET(family, AF_INET, AF_INET6)) continue; - if (sz != PROTO_ADDRESS_SIZE(family)) { + if (sz != FAMILY_ADDRESS_SIZE(family)) { r = -EINVAL; goto fail; } @@ -329,7 +329,7 @@ enum nss_status _nss_resolve_gethostbyname3_r( if (isempty(canonical)) canonical = name; - alen = PROTO_ADDRESS_SIZE(af); + alen = FAMILY_ADDRESS_SIZE(af); l = strlen(canonical); ms = ALIGN(l+1) + @@ -463,7 +463,7 @@ enum nss_status _nss_resolve_gethostbyaddr2_r( return NSS_STATUS_UNAVAIL; } - if (len != PROTO_ADDRESS_SIZE(af)) { + if (len != FAMILY_ADDRESS_SIZE(af)) { *errnop = EINVAL; *h_errnop = NO_RECOVERY; return NSS_STATUS_UNAVAIL; diff --git a/src/shared/in-addr-util.h b/src/shared/in-addr-util.h index 108f1f3ace..aae1f16608 100644 --- a/src/shared/in-addr-util.h +++ b/src/shared/in-addr-util.h @@ -39,7 +39,7 @@ int in_addr_to_string(unsigned family, const union in_addr_union *u, char **ret) int in_addr_from_string(unsigned family, const char *s, union in_addr_union *ret); int in_addr_from_string_auto(const char *s, unsigned *family, union in_addr_union *ret); -static inline size_t PROTO_ADDRESS_SIZE(int proto) { - assert(proto == AF_INET || proto == AF_INET6); - return proto == AF_INET6 ? 16 : 4; +static inline size_t FAMILY_ADDRESS_SIZE(int family) { + assert(family == AF_INET || family == AF_INET6); + return family == AF_INET6 ? 16 : 4; } |