udev: use device_get_sysattr_safe_string() in device_get_sysattr_value_filtered()

Then, renamed to device_get_sysattr_safe_string_filtered().

diff --git a/src/shared/netif-naming-scheme.c b/src/shared/netif-naming-scheme.c
index 607094eecfd296846561a0734e5878a28bf1dd88..ddf3bdde9e84cf80b2c85f93aae80823775d6b94 100644 (file)
--- a/src/shared/netif-naming-scheme.c
+++ b/src/shared/netif-naming-scheme.c
@@ -178,7 +178,7 @@ int device_get_sysattr_bool_filtered(sd_device *device, const char *sysattr) {
         return device_get_sysattr_bool(device, sysattr);
 }
 
-int device_get_sysattr_value_filtered(sd_device *device, const char *sysattr, const char **ret_value) {
+int device_get_sysattr_safe_string_filtered(sd_device *device, const char *sysattr, const char **ret_value) {
         int r;
 
         r = naming_sysattr_allowed(device, sysattr);
@@ -187,5 +187,5 @@ int device_get_sysattr_value_filtered(sd_device *device, const char *sysattr, co
         if (r == 0)
                 return -ENOENT;
 
-        return sd_device_get_sysattr_value(device, sysattr, ret_value);
+        return device_get_sysattr_safe_string(device, sysattr, ret_value);
 }

diff --git a/src/shared/netif-naming-scheme.h b/src/shared/netif-naming-scheme.h
index c13d7649c9ef31199dd2224ae015e3d0a104a482..52c462a6bbd2363426459c1d496247556ee539fe 100644 (file)
--- a/src/shared/netif-naming-scheme.h
+++ b/src/shared/netif-naming-scheme.h
@@ -104,4 +104,4 @@ DECLARE_STRING_TABLE_LOOKUP(alternative_names_policy, NamePolicy);
 int device_get_sysattr_int_filtered(sd_device *device, const char *sysattr, int *ret_value);
 int device_get_sysattr_unsigned_filtered(sd_device *device, const char *sysattr, unsigned *ret_value);
 int device_get_sysattr_bool_filtered(sd_device *device, const char *sysattr);
-int device_get_sysattr_value_filtered(sd_device *device, const char *sysattr, const char **ret_value);
+int device_get_sysattr_safe_string_filtered(sd_device *device, const char *sysattr, const char **ret_value);

diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
index 4e962d54dec7e2e2fb4efc45ad1f8d7634ec88e4..018edcc6d9907e76c72a1a02059a76a03f0471fc 100644 (file)
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -183,7 +183,7 @@ static int get_port_specifier(sd_device *dev, char **ret) {
         assert(ret);
 
         /* First, try to use the kernel provided front panel port name for multiple port PCI device. */
-        r = device_get_sysattr_value_filtered(dev, "phys_port_name", &phys_port_name);
+        r = device_get_sysattr_safe_string_filtered(dev, "phys_port_name", &phys_port_name);
         if (r >= 0 && !isempty(phys_port_name)) {
                 if (naming_scheme_has(NAMING_SR_IOV_R)) {
                         int vf_id = -1;
@@ -304,7 +304,7 @@ static int names_pci_onboard_label(UdevEvent *event, sd_device *pci_dev, const c
         assert(prefix);
 
         /* retrieve on-board label from firmware */
-        r = device_get_sysattr_value_filtered(pci_dev, "label", &label);
+        r = device_get_sysattr_safe_string_filtered(pci_dev, "label", &label);
         if (r < 0)
                 return log_device_debug_errno(pci_dev, r, "Failed to get PCI onboard label: %m");
 
@@ -360,7 +360,7 @@ static bool is_pci_bridge(sd_device *dev) {
 
         assert(dev);
 
-        if (device_get_sysattr_value_filtered(dev, "modalias", &v) < 0)
+        if (device_get_sysattr_safe_string_filtered(dev, "modalias", &v) < 0)
                 return false;
 
         if (!startswith(v, "pci:"))
@@ -402,7 +402,7 @@ static int parse_hotplug_slot_from_function_id(sd_device *dev, int slots_dirfd,
                 return 0;
         }
 
-        if (device_get_sysattr_value_filtered(dev, "function_id", &attr) < 0) {
+        if (device_get_sysattr_safe_string_filtered(dev, "function_id", &attr) < 0) {
                 *ret = 0;
                 return 0;
         }
@@ -465,7 +465,7 @@ static int pci_get_hotplug_slot_from_address(
                 if (!path)
                         return log_oom_debug();
 
-                if (device_get_sysattr_value_filtered(pci, path, &address) < 0)
+                if (device_get_sysattr_safe_string_filtered(pci, path, &address) < 0)
                         continue;
 
                 /* match slot address with device by stripping the function */
@@ -544,7 +544,7 @@ static int get_device_firmware_node_sun(sd_device *dev, uint32_t *ret) {
         assert(dev);
         assert(ret);
 
-        r = device_get_sysattr_value_filtered(dev, "firmware_node/sun", &attr);
+        r = device_get_sysattr_safe_string_filtered(dev, "firmware_node/sun", &attr);
         if (r < 0)
                 return log_device_debug_errno(dev, r, "Failed to read firmware_node/sun, ignoring: %m");
 
@@ -876,7 +876,7 @@ static int names_devicetree_alias_prefix(UdevEvent *event, const char *prefix, c
                 if (!alias_index)
                         continue;
 
-                if (device_get_sysattr_value_filtered(aliases_dev, alias, &alias_path) < 0)
+                if (device_get_sysattr_safe_string_filtered(aliases_dev, alias, &alias_path) < 0)
                         continue;
 
                 if (!path_equal(ofnode_path, alias_path))
@@ -895,7 +895,7 @@ static int names_devicetree_alias_prefix(UdevEvent *event, const char *prefix, c
                 }
 
                 /* ...but make sure we don't have an alias conflict */
-                if (i == 0 && device_get_sysattr_value_filtered(aliases_dev, conflict, NULL) >= 0)
+                if (i == 0 && device_get_sysattr_safe_string_filtered(aliases_dev, conflict, NULL) >= 0)
                         return log_device_debug_errno(dev, SYNTHETIC_ERRNO(EEXIST),
                                         "DeviceTree alias conflict: %s and %s both exist.",
                                         alias_prefix, alias_prefix_0);
@@ -1208,7 +1208,7 @@ static int names_mac(UdevEvent *event, const char *prefix) {
                 return log_device_debug_errno(dev, SYNTHETIC_ERRNO(EINVAL),
                                               "addr_assign_type=%u, MAC address is not permanent.", assign_type);
 
-        r = device_get_sysattr_value_filtered(dev, "address", &s);
+        r = device_get_sysattr_safe_string_filtered(dev, "address", &s);
         if (r < 0)
                 return log_device_debug_errno(dev, r, "Failed to read 'address' attribute: %m");
 
@@ -1253,7 +1253,7 @@ static int names_netdevsim(UdevEvent *event, const char *prefix) {
         if (r < 0)
                 return log_device_debug_errno(netdevsimdev, r, "Failed to get device sysnum: %m");
 
-        r = device_get_sysattr_value_filtered(dev, "phys_port_name", &phys_port_name);
+        r = device_get_sysattr_safe_string_filtered(dev, "phys_port_name", &phys_port_name);
         if (r < 0)
                 return log_device_debug_errno(dev, r, "Failed to get 'phys_port_name' attribute: %m");
         if (isempty(phys_port_name))