From 176b887da4450b80287d11ea178635a93d15dc94 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Wed, 23 Apr 2025 15:43:43 +0200 Subject: [PATCH] bus-message-util: use bus_message_read_family() at one more place --- src/shared/bus-message-util.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/shared/bus-message-util.c b/src/shared/bus-message-util.c index 8da112cacc..1b855df293 100644 --- a/src/shared/bus-message-util.c +++ b/src/shared/bus-message-util.c @@ -82,7 +82,7 @@ int bus_message_read_in_addr_auto(sd_bus_message *message, sd_bus_error *error, assert(message); - r = sd_bus_message_read(message, "i", &family); + r = bus_message_read_family(message, error, &family); if (r < 0) return r; @@ -90,9 +90,6 @@ int bus_message_read_in_addr_auto(sd_bus_message *message, sd_bus_error *error, if (r < 0) return r; - if (!IN_SET(family, AF_INET, AF_INET6)) - return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Unknown address family %i", family); - if (sz != FAMILY_ADDRESS_SIZE(family)) return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid address size");