Merge branch 'mer1749_warnings' into 'master'

Clear warning and misc fixes See merge request !12
sailfishos · Feb 8, 2017 · 1819edd · 1819edd
2 parents 28f826f + 55f9e85
commit 1819edd
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 104 deletions.
diff --git a/adaptors/iioadaptor/iioadaptor.cpp b/adaptors/iioadaptor/iioadaptor.cpp
@@ -154,7 +154,7 @@ int IioAdaptor::findSensor(const QString &sensorName)
 {
     udev_list_entry *devices;
     udev_list_entry *dev_list_entry;
-    udev_device *dev;
+    udev_device *dev = 0;
     struct udev *udevice = 0;
     struct udev_enumerate *enumerate = 0;
 
@@ -225,7 +225,8 @@ int IioAdaptor::findSensor(const QString &sensorName)
             }
         }
     }
-    udev_device_unref(dev);
+    if (dev)
+        udev_device_unref(dev);
     udev_enumerate_unref(enumerate);
 
     if (ok2)
@@ -326,6 +327,8 @@ int IioAdaptor::sysfsReadInt(QString filename)
 // Return the number of channels
 int IioAdaptor::scanElementsEnable(int device, int enable)
 {
+    Q_UNUSED(device);
+
     QString elementsPath = iioDevice.devicePath + "scan_elements";
 
     QDir dir(elementsPath);

diff --git a/adaptors/magnetometeradaptor-evdev/magnetometerevdevadaptor.h b/adaptors/magnetometeradaptor-evdev/magnetometerevdevadaptor.h
@@ -1,5 +1,5 @@
 /**
-   @file magnetometeradaptor-evdevplugin.cpp
+   @file magnetometerevdevadaptor.h
    @brief Contains MagnetometerAdaptorEvdevPlugin.
 
    <p>

diff --git a/core/hybrisadaptor.cpp b/core/hybrisadaptor.cpp
@@ -75,22 +75,6 @@
 //#define SENSOR_TYPE_STEP_COUNTER (19)
 //#define SENSOR_TYPE_GEOMAGNETIC_ROTATION_VECTOR (20)
 
-static QHash<QString,int> HybrisAdaptor_sensorTypes()
-{
-    QHash<QString,int> types;
-    types["accelerometer"] = SENSOR_TYPE_ACCELEROMETER;
-    types["magnetomoter"] = SENSOR_TYPE_MAGNETIC_FIELD;
-    types["orientation"] = SENSOR_TYPE_ORIENTATION;
-    types["gyroscope"] = SENSOR_TYPE_GYROSCOPE;
-    types["light"] = SENSOR_TYPE_LIGHT;
-    types["pressure"] = SENSOR_TYPE_PRESSURE;
-    types["temperature"] = SENSOR_TYPE_TEMPERATURE;
-    types["proximity"] = SENSOR_TYPE_PROXIMITY;
-    types["gravity"] = SENSOR_TYPE_GRAVITY;
-    types["lacceration"] = SENSOR_TYPE_LINEAR_ACCELERATION;
-    return types;
-}
-
 Q_GLOBAL_STATIC(HybrisManager, hybrisManager)
 
 HybrisManager::HybrisManager(QObject *parent)

diff --git a/core/sensormanager.cpp b/core/sensormanager.cpp
@@ -109,12 +109,12 @@ SensorManager::SensorManager()
     deviation(0)
 {
     QString pluginPath;
+    const char* SOCKET_NAME = "/var/run/sensord.sock";
     QByteArray env = qgetenv("SENSORFW_SOCKET_PATH");
-    const char* SOCKET_NAME;
-    if (env.isEmpty())
-        SOCKET_NAME = "/var/run/sensord.sock";
-    else
-        SOCKET_NAME = env+"/var/run/sensord.sock";
+    if (!env.isEmpty()) {
+      env += SOCKET_NAME;
+      SOCKET_NAME = env;
+    }
 
     new SensorManagerAdaptor(this);
 

diff --git a/datatypes/lid.h b/datatypes/lid.h
@@ -49,14 +49,14 @@ class Lid : public QObject
     /**
      * Constructor.
      *
-     * @param LidData Source object.
+     * @param lidData Source object.
      */
     Lid(const LidData& lidData);
 
     /**
      * Copy constructor.
      *
-     * @param Lid Source object.
+     * @param lid Source object.
      */
     Lid(const Lid& lid);
 
@@ -86,7 +86,7 @@ Q_DECLARE_METATYPE( Lid )
  * Marshall the Lid data into a D-Bus argument
  *
  * @param argument dbus argument.
- * @param Lid data to marshall.
+ * @param lid data to marshall.
  * @return dbus argument.
  */
 inline QDBusArgument &operator<<(QDBusArgument &argument, const Lid &lid)
@@ -101,7 +101,7 @@ inline QDBusArgument &operator<<(QDBusArgument &argument, const Lid &lid)
  * Unmarshall Lid data from the D-Bus argument
  *
  * @param argument dbus argument.
- * @param Lid unmarshalled data.
+ * @param lid unmarshalled data.
  * @return dbus argument.
  */
 inline const QDBusArgument &operator>>(const QDBusArgument &argument, Lid &lid)

diff --git a/datatypes/liddata.h b/datatypes/liddata.h
@@ -1,5 +1,5 @@
 /**
-   @file LidData.h
+   @file liddata.h
    @brief Datatype for device tap events
 
    <p>
@@ -57,9 +57,10 @@ class LidData : public TimedData {
      * Constructor.
      * @param timestamp Timestamp of lid event.
      * @param type Type of lid.
+     * @param value Initial value to use
      */
-    LidData(const quint64& timestamp, Type type, unsigned value_) :
-        TimedData(timestamp), type_(type), value_(0) {}
+    LidData(const quint64& timestamp, Type type, unsigned value) :
+        TimedData(timestamp), type_(type), value_(value) {}
 };
 
 Q_DECLARE_METATYPE(LidData)

diff --git a/qt-api/socketreader.cpp b/qt-api/socketreader.cpp
@@ -50,12 +50,12 @@ bool SocketReader::initiateConnection(int sessionId)
     }
 
     socket_ = new QLocalSocket(this);
+    const char* SOCKET_NAME = "/var/run/sensord.sock";
     QByteArray env = qgetenv("SENSORFW_SOCKET_PATH");
-    const char* SOCKET_NAME;
-    if (env.isEmpty())
-        SOCKET_NAME = "/var/run/sensord.sock";
-    else
-        SOCKET_NAME = env+"/var/run/sensord.sock";
+    if (!env.isEmpty()) {
+        env += SOCKET_NAME;
+        SOCKET_NAME = env;
+    }
 
     socket_->connectToServer(SOCKET_NAME, QIODevice::ReadWrite);
 

diff --git a/rpm/sensorfw-qt5-hybris.spec b/rpm/sensorfw-qt5-hybris.spec
@@ -46,7 +46,7 @@ export QT_SELECT=5
 
 %qmake5 CONFIG+=hybris
 
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}

diff --git a/rpm/sensorfw.spec b/rpm/sensorfw.spec
diff --git a/sensord/main.cpp b/sensord/main.cpp
@@ -137,6 +137,8 @@ int main(int argc, char *argv[])
 
     if (parser.createDaemon())
     {
+        fflush(0);
+
         int pid = fork();
 
         if(pid < 0)
@@ -145,7 +147,7 @@ int main(int argc, char *argv[])
             exit(EXIT_FAILURE);
         } else if (pid > 0) {
             sensordLogW() << "Created a daemon";
-            exit(EXIT_SUCCESS);
+            _exit(EXIT_SUCCESS);
         }
     }
 

diff --git a/tests/client/clientapitest.cpp b/tests/client/clientapitest.cpp
@@ -920,8 +920,9 @@ TestClient::~TestClient()
 void TestClient::dataAvailable(const MagneticField&)
 {
     QTime now = QTime::currentTime();
+    ++dataCount;
     qDebug() << "dataAvailable() "
-             << ++dataCount << " in "
+             << dataCount << " in "
              << (dataCount > -1 ? m_exTimeData.msecsTo(now) : 0)
              << " ms" ;
     m_exTimeData = now;
@@ -943,8 +944,9 @@ void TestClient::frameAvailable(const QVector<MagneticField>& frame)
 void TestClient::dataAvailable2(const XYZ&)
 {
     QTime now = QTime::currentTime();
+    ++dataCount;
     qDebug() << "dataAvailable() "
-             << ++dataCount
+             << dataCount
              << " in "
              << (dataCount > -1 ? m_exTimeData.msecsTo(now) : 0)
              << " ms";

diff --git a/tests/powermanagement/powermanagementtests/helpslot.h b/tests/powermanagement/powermanagementtests/helpslot.h
@@ -52,7 +52,11 @@ class HelpSlot : public QThread
         {
             while(!m_stop) {
                 msleep(250);
-                system(QString("echo 0 0 0 | datafaker %1 & { sleep 0.1; eval 'kill $!' &> /dev/null; }").arg(m_inputFile).toLatin1().constData());
+                if (system(QString("echo 0 0 0 | datafaker %1 & { sleep 0.1; eval 'kill $!' &> /dev/null; }").arg(m_inputFile).toLatin1().constData()) != 0) {
+                    /* Gcc will complain about completely ignoring
+                     * system() return values. As we really do not
+                     * care here, use dummy test to silence warnings. */
+                }
             }
         }
     }

diff --git a/tests/powermanagement/standbyoverridetests/helpslot.h b/tests/powermanagement/standbyoverridetests/helpslot.h
@@ -52,11 +52,15 @@ class HelpSlot : public QThread
         {
             while(!m_stop) {
                 msleep(250);
-                system(QString("echo 0 0 0 | datafaker %1 & { sleep 0.1; eval 'kill $!' &> /dev/null; }").arg(m_inputFile).toLatin1().constData());
+                if (system(QString("echo 0 0 0 | datafaker %1 & { sleep 0.1; eval 'kill $!' &> /dev/null; }").arg(m_inputFile).toLatin1().constData()) != 0) {
+                    /* Gcc will complain about completely ignoring
+                     * system() return values. As we really do not
+                     * care here, use dummy test to silence warnings. */
+                }
             }
-
         }
     }
+
     QString m_inputFile;
     int m_valueCount;
     bool m_stop;