From a6000b1f3babe52109f2bf608288a9681a42a50e Mon Sep 17 00:00:00 2001
From: Erich Cordoba <erich.cordoba.malibran@intel.com>
Date: Fri, 20 Sep 2019 06:55:11 -0500
Subject: [PATCH] Fix indentation and style issues in fm-common/fmConfig.cpp

Indentation issues were solve for `fmConfig.cpp`. The cpplint
command below doesn't show issues.

$ cpplint \
--filter=-readability/casting,-runtime/references \
fmConfig.cpp

The filtered out checks may introduce functionality changes so those
weren't fixed in this patch but planned for later phase.

Story: 2006425
Task: 36735

Change-Id: Icbc9dd26a3f0cb0ee4e16bba715fa0e57ab4b61f
Signed-off-by: Erich Cordoba <erich.cordoba.malibran@intel.com>
---
 fm-common/sources/fmConfig.cpp | 107 ++++++++++++++++-----------------
 1 file changed, 53 insertions(+), 54 deletions(-)

diff --git a/fm-common/sources/fmConfig.cpp b/fm-common/sources/fmConfig.cpp
index b8fe4d11..967be210 100644
--- a/fm-common/sources/fmConfig.cpp
+++ b/fm-common/sources/fmConfig.cpp
@@ -17,13 +17,12 @@
 #include "fmSnmpConstants.h"
 #include "fmSnmpUtils.h"
 
-typedef std::map<std::string,std::string> configParams;
+typedef std::map<std::string, std::string> configParams;
 
 static const char *conf = NULL;
 static int config_loaded = false;
 
-std::string trim(std::string str)
-{
+std::string trim(std::string str) {
     if (str.length() == 0) {
         return str;
     }
@@ -33,71 +32,71 @@ std::string trim(std::string str)
     return str.substr(first, (last-first+1));
 }
 
-CFmMutex & getConfMutex(){
-	static CFmMutex *m = new CFmMutex;
-	return *m;
+CFmMutex & getConfMutex() {
+    static CFmMutex *m = new CFmMutex;
+    return *m;
 }
 
-configParams &getConfigMap(){
-	static configParams conf;
-	return conf;
+configParams &getConfigMap() {
+    static configParams conf;
+    return conf;
 }
 
-void fm_conf_set_file(const char *fn){
-	conf = fn;
+void fm_conf_set_file(const char *fn) {
+    conf = fn;
 }
 
-void fm_get_config_paramters(){
-	CfmFile f;
-	std::string delimiter = "=";
-	std::string line, key, value;
-	size_t pos = 0;
+void fm_get_config_paramters() {
+    CfmFile f;
+    std::string delimiter = "=";
+    std::string line, key, value;
+    size_t pos = 0;
 
-	if  (conf == NULL){
-		FM_ERROR_LOG("The config file is not set\n");
-		exit(-1);
-	}
+    if  (conf == NULL) {
+        FM_ERROR_LOG("The config file is not set\n");
+        exit(-1);
+    }
 
-	if (!f.open(conf, CfmFile::READ, false)){
-		FM_ERROR_LOG("Failed to open config file: %s\n", conf);
-		exit(-1);
-	}
+    if (!f.open(conf, CfmFile::READ, false)) {
+        FM_ERROR_LOG("Failed to open config file: %s\n", conf);
+        exit(-1);
+    }
 
-	while (true){
-		if (!f.read_line(line)) break;
+    while (true) {
+        if (!f.read_line(line)) break;
 
-		if (line.size() == 0) continue;
+        if (line.size() == 0) continue;
 
-		if (line[0] == '#') continue;
+        if (line[0] == '#') continue;
 
-		pos = line.find(delimiter);
-		key = trim(line.substr(0, pos));
-		value = trim(line.erase(0, pos + delimiter.length()));
-		getConfigMap()[key] = value;
-		if (key.compare(FM_SNMP_TRAPDEST) == 0){
-			set_trap_dest_list(value);
-		}
-		if (key.compare(FM_SQL_CONNECTION) != 0){
-			// Don't log sql_connection, as it has a password
-			FM_INFO_LOG("Config key (%s), value (%s)",
-			            key.c_str(), value.c_str());
-		}
-	}
+        pos = line.find(delimiter);
+        key = trim(line.substr(0, pos));
+        value = trim(line.erase(0, pos + delimiter.length()));
+        getConfigMap()[key] = value;
+        if (key.compare(FM_SNMP_TRAPDEST) == 0) {
+            set_trap_dest_list(value);
+        }
+        if (key.compare(FM_SQL_CONNECTION) != 0) {
+            // Don't log sql_connection, as it has a password
+            FM_INFO_LOG("Config key (%s), value (%s)",
+                        key.c_str(), value.c_str());
+        }
+    }
 }
 
-bool fm_get_config_key(std::string &key, std::string &val){
-	configParams::iterator it;
-	CFmMutexGuard m(getConfMutex());
+bool fm_get_config_key(std::string &key, std::string &val) {
+    configParams::iterator it;
+    CFmMutexGuard m(getConfMutex());
 
-	if (!config_loaded){
-		fm_get_config_paramters();
-		config_loaded = true;
-	}
+    if (!config_loaded) {
+        fm_get_config_paramters();
+        config_loaded = true;
+    }
 
-	it = getConfigMap().find(key);
-	if (it != getConfigMap().end()){
-		val = it->second;
-		return true;
-	}
-	return false;
+    it = getConfigMap().find(key);
+    if (it != getConfigMap().end()) {
+        val = it->second;
+        return true;
+    }
+    return false;
 }