Avoid number conversion issues

Use unsigned types where we mean unsigned and signed types where we mean
signed. Check the integer range before casting to a smaller type.

Change-Id: Ia2150282e9763855c495bd5547e2bc176d8d93be
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>

2 files changed, 13 insertions, 12 deletions

diff --git a/tests/auto/elfmap/tst_elfmap.cpp b/tests/auto/elfmap/tst_elfmap.cpp
index 58ce323..aac377b 100644
--- a/tests/auto/elfmap/tst_elfmap.cpp
+++ b/tests/auto/elfmap/tst_elfmap.cpp
@@ -169,7 +169,7 @@ private slots:
 
     void benchRegisterElfDisjunct()
     {
-        QFETCH(int, numElfMaps);
+        QFETCH(uint, numElfMaps);
         const quint64 ADDR_STEP = 1024;
         const quint64 MAX_ADDR = ADDR_STEP * numElfMaps;
         const quint64 LEN = 1024;
@@ -183,16 +183,16 @@ private slots:
 
     void benchRegisterElfDisjunct_data()
     {
-        QTest::addColumn<int>("numElfMaps");
-        QTest::newRow("10") << 10;
-        QTest::newRow("100") << 100;
-        QTest::newRow("1000") << 1000;
-        QTest::newRow("2000") << 2000;
+        QTest::addColumn<uint>("numElfMaps");
+        QTest::newRow("10") << 10u;
+        QTest::newRow("100") << 100u;
+        QTest::newRow("1000") << 1000u;
+        QTest::newRow("2000") << 2000u;
     }
 
     void benchRegisterElfOverlapping()
     {
-        QFETCH(int, numElfMaps);
+        QFETCH(uint, numElfMaps);
         const quint64 ADDR_STEP = 1024;
         const quint64 MAX_ADDR = ADDR_STEP * numElfMaps;
         quint64 len = MAX_ADDR;
@@ -212,7 +212,7 @@ private slots:
 
     void benchRegisterElfExpanding()
     {
-        QFETCH(int, numElfMaps);
+        QFETCH(uint, numElfMaps);
         const quint64 ADDR = 0;
         const quint64 LEN_STEP = 1024;
         const quint64 MAX_LEN = LEN_STEP * numElfMaps;
@@ -231,7 +231,7 @@ private slots:
 
     void benchFindElfDisjunct()
     {
-        QFETCH(int, numElfMaps);
+        QFETCH(uint, numElfMaps);
 
         PerfElfMap map;
 
@@ -258,7 +258,7 @@ private slots:
 
     void benchFindElfOverlapping()
     {
-        QFETCH(int, numElfMaps);
+        QFETCH(uint, numElfMaps);
 
         PerfElfMap map;
 
@@ -285,7 +285,7 @@ private slots:
 
     void benchFindElfExpanding()
     {
-        QFETCH(int, numElfMaps);
+        QFETCH(uint, numElfMaps);
 
         PerfElfMap map;
 
diff --git a/tests/auto/perfdata/tst_perfdata.cpp b/tests/auto/perfdata/tst_perfdata.cpp
index e9fc85f..bf4b72c 100644
--- a/tests/auto/perfdata/tst_perfdata.cpp
+++ b/tests/auto/perfdata/tst_perfdata.cpp
@@ -164,8 +164,9 @@ void TestPerfData::testTracingData()
         const PerfParserTestClient::AttributeEvent attribute
                 = client.attribute(sample.attributeId);
         QCOMPARE(attribute.type, 2u);
+        QVERIFY(attribute.config <= std::numeric_limits<qint32>::max());
         const PerfParserTestClient::TracePointFormatEvent format
-                = client.tracePointFormat(attribute.config);
+                = client.tracePointFormat(static_cast<qint32>(attribute.config));
         QCOMPARE(client.string(format.system), QByteArray("probe_untitled1"));
         QCOMPARE(client.string(format.name), QByteArray("main"));
         QCOMPARE(format.flags, 0u);