From 1013d61f492f168e90d7266dcec59a79a869d69a Mon Sep 17 00:00:00 2001
From: Denis Shienkov <denis.shienkov@gmail.com>
Date: Fri, 28 Nov 2014 21:48:56 +0000
Subject: Make QSPI udev functions more readable

Change-Id: I5c33421338e6a64dbadeb168cf165a84bedec5b9
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
---
 src/serialport/qserialportinfo_unix.cpp | 68 ++++++++++++++++++---------------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/src/serialport/qserialportinfo_unix.cpp b/src/serialport/qserialportinfo_unix.cpp
index 8bf5692..b2f2a1c 100644
--- a/src/serialport/qserialportinfo_unix.cpp
+++ b/src/serialport/qserialportinfo_unix.cpp
@@ -241,49 +241,54 @@ struct ScopedPointerUdevDeviceDeleter
     Q_GLOBAL_STATIC(QLibrary, udevLibrary)
 #endif
 
-static
-QString getUdevPropertyValue(struct ::udev_device *dev, const char *name)
+static bool isSerial8250Driver(const QString &driverName)
+{
+    return (driverName == QStringLiteral("serial8250"));
+}
+
+static QString deviceProperty(struct ::udev_device *dev, const char *name)
 {
     return QString::fromLatin1(::udev_device_get_property_value(dev, name));
 }
 
-static
-bool checkUdevForSerial8250Driver(struct ::udev_device *dev)
+static QString deviceDriver(struct ::udev_device *dev)
 {
-    const QString driverName = QString::fromLatin1(::udev_device_get_driver(dev));
-    return (driverName == QStringLiteral("serial8250"));
+    return QString::fromLatin1(::udev_device_get_driver(dev));
+}
+
+static QString deviceDescription(struct ::udev_device *dev)
+{
+    return deviceProperty(dev, "ID_MODEL").replace(QLatin1Char('_'), QLatin1Char(' '));
+}
+
+static QString deviceManufacturer(struct ::udev_device *dev)
+{
+    return deviceProperty(dev, "ID_VENDOR").replace(QLatin1Char('_'), QLatin1Char(' '));
 }
 
-static
-QString getUdevModelName(struct ::udev_device *dev)
+static quint16 deviceProductIdentifier(struct ::udev_device *dev, bool &hasIdentifier)
 {
-    return getUdevPropertyValue(dev, "ID_MODEL")
-            .replace(QLatin1Char('_'), QLatin1Char(' '));
+    return deviceProperty(dev, "ID_MODEL_ID").toInt(&hasIdentifier, 16);
 }
 
-static
-QString getUdevVendorName(struct ::udev_device *dev)
+static quint16 deviceVendorIdentifier(struct ::udev_device *dev, bool &hasIdentifier)
 {
-    return getUdevPropertyValue(dev, "ID_VENDOR")
-            .replace(QLatin1Char('_'), QLatin1Char(' '));
+    return deviceProperty(dev, "ID_VENDOR_ID").toInt(&hasIdentifier, 16);
 }
 
-static
-quint16 getUdevModelIdentifier(struct ::udev_device *dev, bool &hasIdentifier)
+static QString deviceSerialNumber(struct ::udev_device *dev)
 {
-    return getUdevPropertyValue(dev, "ID_MODEL_ID").toInt(&hasIdentifier, 16);
+    return deviceProperty(dev,"ID_SERIAL_SHORT");
 }
 
-static
-quint16 getUdevVendorIdentifier(struct ::udev_device *dev, bool &hasIdentifier)
+static QString deviceName(struct ::udev_device *dev)
 {
-    return getUdevPropertyValue(dev, "ID_VENDOR_ID").toInt(&hasIdentifier, 16);
+    return QString::fromLatin1(::udev_device_get_sysname(dev));
 }
 
-static
-QString getUdevSerialNumber(struct ::udev_device *dev)
+static QString deviceLocation(struct ::udev_device *dev)
 {
-    return getUdevPropertyValue(dev,"ID_SERIAL_SHORT");
+    return QString::fromLatin1(::udev_device_get_devnode(dev));
 }
 
 QList<QSerialPortInfo> availablePortsByUdev(bool &ok)
@@ -328,19 +333,20 @@ QList<QSerialPortInfo> availablePortsByUdev(bool &ok)
 
         QSerialPortInfoPrivate priv;
 
-        priv.device = QString::fromLatin1(::udev_device_get_devnode(dev.data()));
-        priv.portName = QString::fromLatin1(::udev_device_get_sysname(dev.data()));
+        priv.device = deviceLocation(dev.data());
+        priv.portName = deviceName(dev.data());
 
         udev_device *parentdev = ::udev_device_get_parent(dev.data());
 
         if (parentdev) {
-            if (checkUdevForSerial8250Driver(parentdev))
+            const QString driverName = deviceDriver(parentdev);
+            if (isSerial8250Driver(driverName))
                 continue;
-            priv.description = getUdevModelName(dev.data());
-            priv.manufacturer = getUdevVendorName(dev.data());
-            priv.serialNumber = getUdevSerialNumber(dev.data());
-            priv.vendorIdentifier = getUdevVendorIdentifier(dev.data(), priv.hasVendorIdentifier);
-            priv.productIdentifier = getUdevModelIdentifier(dev.data(), priv.hasProductIdentifier);
+            priv.description = deviceDescription(dev.data());
+            priv.manufacturer = deviceManufacturer(dev.data());
+            priv.serialNumber = deviceSerialNumber(dev.data());
+            priv.vendorIdentifier = deviceVendorIdentifier(dev.data(), priv.hasVendorIdentifier);
+            priv.productIdentifier = deviceProductIdentifier(dev.data(), priv.hasProductIdentifier);
         } else {
             if (priv.portName.startsWith(rfcommDeviceName)) {
                 bool ok;
-- 
cgit v1.2.1