aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArttu Tarkiainen <arttu.tarkiainen@qt.io>2023-01-17 12:40:19 +0200
committerArttu Tarkiainen <arttu.tarkiainen@qt.io>2023-01-18 12:49:59 +0000
commitd9d3a9db7e6fca8c791ceda6f16611c0067c7f29 (patch)
treebde9dedbccebfc9dfe85f774db64f8bb00be8d18
parent391a8515d133f82ecc236b9b44dd0f6e0da839e9 (diff)
Fix 'simple sanitizer' warnings
A couple minor issues about white space usage. After this change the only warning left should be about the libcurl build artifact in the 3rdparty directory. Change-Id: Icf08640c8b284c8f1e18f1351b5de9beaa56ad1b Reviewed-by: Sami Littow <sami.littow@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
-rw-r--r--CMakePresets.json2
-rw-r--r--include/commonsetup.h12
-rw-r--r--src/clienthandler.cpp2
-rw-r--r--src/daemon_clients/cocohandler.h2
-rw-r--r--src/daemon_clients/mochandler.h3
-rw-r--r--src/daemon_clients/pluginhandler.h3
-rw-r--r--src/daemon_clients/squishhandler.h2
-rw-r--r--src/daemon_clients/squishidehandler.h6
-rw-r--r--src/httpclient.cpp2
9 files changed, 16 insertions, 18 deletions
diff --git a/CMakePresets.json b/CMakePresets.json
index d4d9f74..7dc3f12 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -74,4 +74,4 @@
"jobs": 2
}
]
-} \ No newline at end of file
+}
diff --git a/include/commonsetup.h b/include/commonsetup.h
index 92d27bb..5bace4c 100644
--- a/include/commonsetup.h
+++ b/include/commonsetup.h
@@ -87,12 +87,12 @@ enum class RequestType {
enum class ClientType {
client_undefined = -1,
- client_moc = 1,
- client_plugin,
- client_CLI,
- client_squish,
- client_squish_ide,
- client_coco
+ client_moc = 1,
+ client_plugin,
+ client_CLI,
+ client_squish,
+ client_squish_ide,
+ client_coco
};
// Struct to store request info
diff --git a/src/clienthandler.cpp b/src/clienthandler.cpp
index c60d730..b5fec10 100644
--- a/src/clienthandler.cpp
+++ b/src/clienthandler.cpp
@@ -30,7 +30,7 @@ bool ClientHandler::checkLicenseExpiryTime(std::string &reply)
// See if the time has expire
if (current > expEpoch) {
// Store the leeway time if applicable
- if(license.get("leeway_hours") != "") {
+ if (license.get("leeway_hours") != "") {
m_license.leeway_hours = license.getInt("leeway_hours");
m_license.current_timestamp = current;
m_license.expiry_epoch = expEpoch;
diff --git a/src/daemon_clients/cocohandler.h b/src/daemon_clients/cocohandler.h
index d4a32d9..54fa49b 100644
--- a/src/daemon_clients/cocohandler.h
+++ b/src/daemon_clients/cocohandler.h
@@ -26,4 +26,4 @@ class CocoHandler : public ClientHandler {
return;
};
-}; \ No newline at end of file
+};
diff --git a/src/daemon_clients/mochandler.h b/src/daemon_clients/mochandler.h
index d0dc579..d73f8db 100644
--- a/src/daemon_clients/mochandler.h
+++ b/src/daemon_clients/mochandler.h
@@ -101,5 +101,4 @@ class MocHandler : virtual public ClientHandler {
}
return 0;
}
-
-}; \ No newline at end of file
+};
diff --git a/src/daemon_clients/pluginhandler.h b/src/daemon_clients/pluginhandler.h
index 132f128..6d39500 100644
--- a/src/daemon_clients/pluginhandler.h
+++ b/src/daemon_clients/pluginhandler.h
@@ -73,5 +73,4 @@ class PluginHandler : public ClientHandler {
}
return 0;
}
-
-}; \ No newline at end of file
+};
diff --git a/src/daemon_clients/squishhandler.h b/src/daemon_clients/squishhandler.h
index 24c5aed..2542442 100644
--- a/src/daemon_clients/squishhandler.h
+++ b/src/daemon_clients/squishhandler.h
@@ -100,4 +100,4 @@ class SquishHandler : public ClientHandler {
return true;
return false;
}
-}; \ No newline at end of file
+};
diff --git a/src/daemon_clients/squishidehandler.h b/src/daemon_clients/squishidehandler.h
index 8f08e0c..abef26a 100644
--- a/src/daemon_clients/squishidehandler.h
+++ b/src/daemon_clients/squishidehandler.h
@@ -18,12 +18,12 @@ class SquishIdeHandler : public ClientHandler {
}
bool isLicenseRequestDue() override { return true; }
- bool isCachedReservationValid(std::string &reply) override {return true;}
+ bool isCachedReservationValid(std::string &reply) override {return true;}
void buildRequestJson() override {return;}
- int parseAndSaveResponse(std::string &response) override { return 0; }
+ int parseAndSaveResponse(std::string &response) override { return 0; }
void prepareRelease() override
{
// TODO
return;
};
-}; \ No newline at end of file
+};
diff --git a/src/httpclient.cpp b/src/httpclient.cpp
index 0682be8..506936c 100644
--- a/src/httpclient.cpp
+++ b/src/httpclient.cpp
@@ -110,7 +110,7 @@ int HttpClient::doRequest(CURL *curl, HttpRequest &request)
else {
curl_easy_setopt(curl, CURLOPT_HTTPGET, 1);
}
- if(curl_easy_setopt(curl, CURLOPT_USE_SSL, (long)CURLUSESSL_ALL) != CURLE_OK) {
+ if (curl_easy_setopt(curl, CURLOPT_USE_SSL, (long)CURLUSESSL_ALL) != CURLE_OK) {
std::cout << "Warning! No SSL support available\n";
}
curl_easy_setopt(curl, CURLOPT_TIMEOUT, SERVER_CONN_TIMEOUT);