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/machine | |
| 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/machine')
| -rw-r--r-- | src/machine/machine-dbus.c | 10 | ||||
| -rw-r--r-- | src/machine/machinectl.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c index daa60d11e..89c93779d 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -233,12 +233,12 @@ int bus_machine_method_get_addresses(sd_bus *bus, sd_bus_message *message, void if (r < 0) return sd_bus_error_set_errno(error, r); - r = sd_bus_message_open_container(reply, 'a', "(yay)"); + r = sd_bus_message_open_container(reply, 'a', "(iay)"); if (r < 0) return sd_bus_error_set_errno(error, r); for (;;) { - unsigned char family; + int family; ssize_t n; union in_addr_union in_addr; struct iovec iov[2]; @@ -256,11 +256,11 @@ int bus_machine_method_get_addresses(sd_bus *bus, sd_bus_message *message, void if ((size_t) n < sizeof(family)) break; - r = sd_bus_message_open_container(reply, 'r', "yay"); + r = sd_bus_message_open_container(reply, 'r', "iay"); if (r < 0) return sd_bus_error_set_errno(error, r); - r = sd_bus_message_append(reply, "y", family); + r = sd_bus_message_append(reply, "i", family); if (r < 0) return sd_bus_error_set_errno(error, r); @@ -405,7 +405,7 @@ const sd_bus_vtable machine_vtable[] = { SD_BUS_PROPERTY("State", "s", property_get_state, 0, 0), SD_BUS_METHOD("Terminate", NULL, NULL, bus_machine_method_terminate, SD_BUS_VTABLE_CAPABILITY(CAP_KILL)), SD_BUS_METHOD("Kill", "si", NULL, bus_machine_method_kill, SD_BUS_VTABLE_CAPABILITY(CAP_KILL)), - SD_BUS_METHOD("GetAddresses", NULL, "a(yay)", bus_machine_method_get_addresses, SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("GetAddresses", NULL, "a(iay)", bus_machine_method_get_addresses, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("GetOSRelease", NULL, "a{ss}", bus_machine_method_get_os_release, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_VTABLE_END }; diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index 04c7c7c67..cc3be98b5 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -188,17 +188,17 @@ static int print_addresses(sd_bus *bus, const char *name, int ifi, const char *p if (r < 0) return r; - r = sd_bus_message_enter_container(reply, 'a', "(yay)"); + r = sd_bus_message_enter_container(reply, 'a', "(iay)"); if (r < 0) return bus_log_parse_error(r); - 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; char buffer[MAX(INET6_ADDRSTRLEN, INET_ADDRSTRLEN)]; - r = sd_bus_message_read(reply, "y", &family); + r = sd_bus_message_read(reply, "i", &family); if (r < 0) return bus_log_parse_error(r); |