diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-07-18 16:09:30 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-07-18 16:10:51 +0200 |
| commit | 0dd25fb9f005d8ab7ac4bc10a609d00569f8c56a (patch) | |
| tree | 2f253672d8a0a97c8c19ba1ce2cad26a5bef62a8 /src/nss-mymachines | |
| parent | f41925b4e442a34c93ad120ef1426c974a047ed1 (diff) | |
change type for address family to "int"
Let's settle on a single type for all address family values, even if
UNIX is very inconsitent on the precise type otherwise. Given that
socket() is the primary entrypoint for the sockets API, and that uses
"int", and "int" is relatively simple and generic, we settle on "int"
for this.
Diffstat (limited to 'src/nss-mymachines')
| -rw-r--r-- | src/nss-mymachines/nss-mymachines.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c index 09c5d05f2e..985ebb7134 100644 --- a/src/nss-mymachines/nss-mymachines.c +++ b/src/nss-mymachines/nss-mymachines.c @@ -32,7 +32,7 @@ NSS_GETHOSTBYNAME_PROTOTYPES(mymachines); -static int count_addresses(sd_bus_message *m, unsigned af, unsigned *ret) { +static int count_addresses(sd_bus_message *m, int af, unsigned *ret) { unsigned c = 0; int r; @@ -40,9 +40,9 @@ static int count_addresses(sd_bus_message *m, unsigned af, unsigned *ret) { assert(ret); while ((r = sd_bus_message_enter_container(m, 'r', "yay")) > 0) { - unsigned char family; + int family; - r = sd_bus_message_read(m, "y", &family); + r = sd_bus_message_read(m, "i", &family); if (r < 0) return r; @@ -122,7 +122,7 @@ enum nss_status _nss_mymachines_gethostbyname4_r( if (r < 0) goto fail; - r = sd_bus_message_enter_container(reply, 'a', "(yay)"); + r = sd_bus_message_enter_container(reply, 'a', "(iay)"); if (r < 0) goto fail; @@ -151,12 +151,12 @@ enum nss_status _nss_mymachines_gethostbyname4_r( /* Second, append addresses */ r_tuple_first = (struct gaih_addrtuple*) (buffer + idx); - while ((r = sd_bus_message_enter_container(reply, 'r', "yay")) > 0) { - unsigned char family; + while ((r = sd_bus_message_enter_container(reply, 'r', "iay")) > 0) { + int family; const void *a; size_t sz; - r = sd_bus_message_read(reply, "y", &family); + r = sd_bus_message_read(reply, "i", &family); if (r < 0) goto fail; @@ -267,7 +267,7 @@ enum nss_status _nss_mymachines_gethostbyname3_r( if (r < 0) goto fail; - r = sd_bus_message_enter_container(reply, 'a', "(yay)"); + r = sd_bus_message_enter_container(reply, 'a', "(iay)"); if (r < 0) goto fail; @@ -307,12 +307,12 @@ enum nss_status _nss_mymachines_gethostbyname3_r( /* Third, append addresses */ r_addr = buffer + idx; - while ((r = sd_bus_message_enter_container(reply, 'r', "yay")) > 0) { - unsigned char family; + while ((r = sd_bus_message_enter_container(reply, 'r', "iay")) > 0) { + int family; const void *a; size_t sz; - r = sd_bus_message_read(reply, "y", &family); + r = sd_bus_message_read(reply, "i", &family); if (r < 0) goto fail; |