]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
bus-message-util: use bus_message_read_family() at one more place
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 23 Apr 2025 13:43:43 +0000 (15:43 +0200)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 24 Apr 2025 01:11:07 +0000 (10:11 +0900)
src/shared/bus-message-util.c

index 8da112caccb594fefbc96f1bf8dc59c5820db555..1b855df29316f2dbe9ed25d92946ff57b39e64cb 100644 (file)
@@ -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");