From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 28 Feb 2019 10:40:44 +0000 (+0100)
Subject: udev-builtin-usb_id: use strjoina to simplify code
X-Git-Tag: v242-rc1~221^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8bdca77c407d100b8c81e2108aba47a8810ead88;p=thirdparty%2Fsystemd.git

udev-builtin-usb_id: use strjoina to simplify code
---

diff --git a/src/udev/udev-builtin-usb_id.c b/src/udev/udev-builtin-usb_id.c
index 3525d250489..489b232814f 100644
--- a/src/udev/udev-builtin-usb_id.c
+++ b/src/udev/udev-builtin-usb_id.c
@@ -138,13 +138,12 @@ static void set_scsi_type(char *to, const char *from, size_t len) {
 #define USB_DT_INTERFACE                0x04
 
 static int dev_if_packed_info(sd_device *dev, char *ifs_str, size_t len) {
-        _cleanup_free_ char *filename = NULL;
         _cleanup_close_ int fd = -1;
         ssize_t size;
         unsigned char buf[18 + 65535];
         size_t pos = 0;
         unsigned strpos = 0;
-        const char *syspath;
+        const char *filename, *syspath;
         int r;
         struct usb_interface_descriptor {
                 uint8_t bLength;
@@ -161,12 +160,11 @@ static int dev_if_packed_info(sd_device *dev, char *ifs_str, size_t len) {
         r = sd_device_get_syspath(dev, &syspath);
         if (r < 0)
                 return r;
-        if (asprintf(&filename, "%s/descriptors", syspath) < 0)
-                return log_oom();
 
+        filename = strjoina(syspath, "/descriptors");
         fd = open(filename, O_RDONLY|O_CLOEXEC);
         if (fd < 0)
-                return log_device_debug_errno(dev, errno, "Failed to open USB device 'descriptors' file: %m");
+                return log_device_debug_errno(dev, errno, "Failed to open \"%s\": %m", filename);
 
         size = read(fd, buf, sizeof(buf));
         if (size < 18 || (size_t) size >= sizeof(buf))