From 14416a437ff227d477e4fbccb416aae9cca6db1f Mon Sep 17 00:00:00 2001
From: Lais Frigerio <laaisfrigerio@gmail.com>
Date: Wed, 15 Feb 2017 09:47:04 -0200
Subject: [PATCH] Reparing cpplint requests
---
.gitlab-ci.yml | 2 +-
src/agent/linux/datasid-agent.cpp | 2 +-
src/agent/linux/datasid-common.cpp | 13 +++++++++----
src/agent/linux/datasid-conf.cpp | 5 ++++-
src/agent/linux/datasid-proxy.cpp | 5 ++++-
src/agent/main.cpp | 2 --
6 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 46ca80e4..3ccf7a73 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ pattern:
- apt-get update && apt-get install -y git python
- git clone https://github.com/google/styleguide
- cd styleguide/cpplint
- - ./cpplint.py --filter=-whitespace/blank_line,-build/include_what_you_use ../../src/!(jsoncpp).cpp ../../src/linux/*.cpp ../../src/windows/*.cpp
+ - ./cpplint.py --filter=-whitespace/blank_line,-build/include_what_you_use ../../src/agent/!(jsoncpp).cpp ../../src/agent/linux/*.cpp ../../src/agent/windows/*.cpp
compile:
stage: build
diff --git a/src/agent/linux/datasid-agent.cpp b/src/agent/linux/datasid-agent.cpp
index dc7c4ac5..d87f0a48 100644
--- a/src/agent/linux/datasid-agent.cpp
+++ b/src/agent/linux/datasid-agent.cpp
@@ -119,7 +119,7 @@ int datasid_agent() {
Json::StyledWriter styledWriter;
if (!update.isNull())
std::cout << styledWriter.write(update) << std::endl;
- else
+ else
std::cout << "Empty updat object" << std::endl;
#endif
diff --git a/src/agent/linux/datasid-common.cpp b/src/agent/linux/datasid-common.cpp
index 7ea1a2f9..3a470f04 100644
--- a/src/agent/linux/datasid-common.cpp
+++ b/src/agent/linux/datasid-common.cpp
@@ -36,8 +36,9 @@ bool fileExist(const std::string& file) {
return false;
}
-
-bool datasid_common(Conf* conf, Proxy* proxy, Agent* agent, Json::Value& update) {
+// NOLINTNEXTLINE(runtime/references)
+bool datasid_common(Conf* conf, Proxy* proxy, Json::Value& update,
+ Agent* agent) {
try {
prefixIsSet(agent->getPrefix());
} catch (const char* msg) {
@@ -49,7 +50,9 @@ bool datasid_common(Conf* conf, Proxy* proxy, Agent* agent, Json::Value& update)
/* Read config file and declare only valid variables */
if (!fileExist(agent->getDefaultConf())) {
- std::string var = __DATE__ + std::string(" - ERROR: Conf file not found.");
+ std::string var = __DATE__ +
+ std::string(" - ERROR: Conf file not found.");
+
update["update"]["conf_file_not_found"] = var;
return false;
} else {
@@ -61,7 +64,9 @@ bool datasid_common(Conf* conf, Proxy* proxy, Agent* agent, Json::Value& update)
/* Read proxy file and declare only valid variables */
if (!fileExist(conf->getProxyConf())) {
- std::string var = __DATE__ + std::string(" - WARNING: Proxy file not found.");
+ std::string var = __DATE__ +
+ std::string(" - WARNING: Proxy file not found.");
+
update["update"]["proxy_file_not_found"] = var;
} else {
if (!datasid_proxy(conf, proxy, update)) {
diff --git a/src/agent/linux/datasid-conf.cpp b/src/agent/linux/datasid-conf.cpp
index cd919978..f4d00828 100644
--- a/src/agent/linux/datasid-conf.cpp
+++ b/src/agent/linux/datasid-conf.cpp
@@ -144,12 +144,15 @@ bool setConf(Conf* conf, Agent* agent, std::map<std::string,
return true;
}
+// NOLINTNEXTLINE(runtime/references)
bool datasid_conf(Agent* agent, Conf* conf, Json::Value& update) {
std::map<std::string, std::string> content;
if (readFile(agent->getDefaultConf(), &content)) {
if (!setConf(conf, agent, &content)) {
- std::string var = __DATE__ + std::string(" - ERROR: to parse variables from config file.");
+ std::string var = __DATE__ +
+ std::string(" - ERROR: to parse variables from config file.");
+
update["update"]["conf_file_not_found"] = var;
return false;
}
diff --git a/src/agent/linux/datasid-proxy.cpp b/src/agent/linux/datasid-proxy.cpp
index 4629cca5..c33cc6e4 100644
--- a/src/agent/linux/datasid-proxy.cpp
+++ b/src/agent/linux/datasid-proxy.cpp
@@ -84,12 +84,15 @@ bool setProxy(Proxy* proxy, std::map<std::string, std::string>* content) {
return true;
}
+// NOLINTNEXTLINE(runtime/references)
bool datasid_proxy(Conf* conf, Proxy* proxy, Json::Value& update) {
std::map<std::string, std::string> content;
if (readFile(conf->getProxyConf(), &content)) {
if (!setProxy(proxy, &content)) {
- std::string var = __DATE__ + std::string(" - ERROR: to parse variables from proxy file.");
+ std::string var = __DATE__ +
+ std::string(" - ERROR: to parse variables from proxy file.");
+
update["update"]["proxy_file_not_found"] = var;
return false;
}
diff --git a/src/agent/main.cpp b/src/agent/main.cpp
index 74528977..79979433 100644
--- a/src/agent/main.cpp
+++ b/src/agent/main.cpp
@@ -27,9 +27,7 @@
#include "agent/main.h"
int main() {
-
datasid_agent();
-
send_inventory();
send_net_bandwidth();
send_user_history();
--
GitLab