From 3a0b7c7c25a5483906471dd79853a6efe358ae7a Mon Sep 17 00:00:00 2001
From: pandx <dxpan2002@163.com>
Date: Thu, 24 Oct 2024 16:34:11 +0800
Subject: [PATCH] fix build warning.

---
 .cproject                       |  4 ++--
 dbaccess/sql_db.cpp             | 18 ++++++++++++++++++
 dbaccess/sql_db.hpp             | 30 ++++++++++++++----------------
 jsonparse/communication_cmd.hpp | 18 ------------------
 jsonparse/mqtt_cmd_parse.cpp    | 18 ++++++++++++++++++
 jsonparse/web_cmd_parse.cpp     | 12 ++++++++++++
 jsonparse/web_cmd_parse3.cpp    |  1 +
 threadfunc/thread_func.cpp      |  2 +-
 8 files changed, 66 insertions(+), 37 deletions(-)

diff --git a/.cproject b/.cproject
index b25dc1a..f34d6c6 100644
--- a/.cproject
+++ b/.cproject
@@ -14,7 +14,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.config.gnu.cross.exe.debug.534720554" name="Debug" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=" parent="cdt.managedbuild.config.gnu.cross.exe.debug" postannouncebuildStep="" postbuildStep="" preannouncebuildStep="" prebuildStep="">
+				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.config.gnu.cross.exe.debug.534720554" name="Debug" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=" parent="cdt.managedbuild.config.gnu.cross.exe.debug" postannouncebuildStep="" postbuildStep="" preannouncebuildStep="" prebuildStep="">
 					<folderInfo id="cdt.managedbuild.config.gnu.cross.exe.debug.534720554." name="/" resourcePath="">
 						<toolChain errorParsers="" id="cdt.managedbuild.toolchain.gnu.cross.exe.debug.414193457" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.exe.debug">
 							<option id="cdt.managedbuild.option.gnu.cross.prefix.1212588849" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix" useByScannerDiscovery="false" value="arm-linux-gnueabihf-" valueType="string"/>
@@ -101,7 +101,7 @@
 							<option id="cdt.managedbuild.option.gnu.cross.prefix.1625525504" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix" useByScannerDiscovery="false" value="arm-linux-gnueabihf-" valueType="string"/>
 							<option id="cdt.managedbuild.option.gnu.cross.path.198654844" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path" useByScannerDiscovery="false" value="/home/chaos/WorkSpace/Tools/GatewayToolsChain/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux/bin" valueType="string"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.1898042134" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/>
-							<builder buildPath="${workspace_loc:/WirelessGateway}/Release" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.CWDLocator" id="cdt.managedbuild.builder.gnu.cross.2122902688" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.builder.gnu.cross"/>
+							<builder buildPath="${workspace_loc:/WirelessGateway}/Release" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.CWDLocator" id="cdt.managedbuild.builder.gnu.cross.2122902688" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="8" superClass="cdt.managedbuild.builder.gnu.cross"/>
 							<tool command="gcc" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.tool.gnu.cross.c.compiler.171749014" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
 								<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.option.optimization.level.148132182" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="gnu.c.optimization.level.none" valueType="enumerated"/>
 								<option id="gnu.c.compiler.option.debugging.level.374757586" name="Debug Level" superClass="gnu.c.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.none" valueType="enumerated"/>
diff --git a/dbaccess/sql_db.cpp b/dbaccess/sql_db.cpp
index d03df95..bb7d722 100644
--- a/dbaccess/sql_db.cpp
+++ b/dbaccess/sql_db.cpp
@@ -10,6 +10,24 @@
 extern zlog_category_t *zct;
 extern zlog_category_t *zbt;
 
+// clang-format off
+const char *T_SENSOR_INFO1[] = {"t_sensor_info", "dataNodeNo",     "dataNodeName",    "initFlag",       "accFlag",       "zigbeeFlag",      "temTopFlag",   "temBotFlag",   "equipSta", "hardVersion", "softVersion",      "bpNo",
+                                      "serialNo",      "firstPowerTime", "configFlag",      "startBrands",    "stopBrands",    "featureInterVal", "waveInterVal", "samplingRate", "scope",    "range",       "envelopeBandPass", "faultFrequency",
+                                      "zigbeePanId",   "zigbeeChannel",  "zigbeeShortAddr", "zigbeeLongAddr", "zigbeeDesAddr", "status",          "timeStamp",    "viff",         "RSSI"};
+
+const char *T_DATA_INFO1[] = {"t_data_info", "dataNodeNo", "channelID", "diagnosisPk", "integratPk", "integratRMS", "rmsValues",   "envelopEnergy", "Amp1",    "Amp2",      "Amp3",
+                                    "Amp4",        "Amp5",       "Phase1",    "Phase2",      "Phase3",     "Phase4",      "StaticIndex", "timeStamp",     "sendMsg", "nodeResend"};
+
+const char *T_DATASTATIC_INFO1[] = {"t_datastatic_info", "dataNodeNo", "channelID", "temTop", "temBot", "dip", "voltage", "StaticIndex", "timeStamp", "sendMsg", "nodeResend"};
+
+const char *T_DATANODE_TIME1[] = {"t_datanode_time", "dataNodeNo", "shortaddr", "staticcycle", "wavecycle", "nodegroup", "nodeindex", "nodewaveindex", "statictime", "staticstarttime"};
+
+const char *T_GATEWAY_INFO1[] = {"t_gateway_info", "gatewayMAC",     "sensorVersion", "gatewayLocation", "zigbeePanID", "zigbeeChannel", "communicationType", "signal", "localIP",
+                                       "systemVersion",  "programVersion", "webVersion",    "serverIP",        "serverPort",  "status",        "gateWayUpdate",     "MAC2"};
+
+const char *T_BATTERY_INFO1[] = {"t_battery_info", "dataNodeNo", "Dip", "temBot", "nodeWorkTime", "nodeSendTime", "batteryVoltage", "batteryUsage", "batteryRemain", "timeStamp"};
+// clang-format on
+
 SqliteDB::SqliteDB() {}
 
 SqliteDB::~SqliteDB() {}
diff --git a/dbaccess/sql_db.hpp b/dbaccess/sql_db.hpp
index 29c5ba5..02fa145 100644
--- a/dbaccess/sql_db.hpp
+++ b/dbaccess/sql_db.hpp
@@ -10,12 +10,19 @@ extern "C" {
 #include <mutex>
 #include <boost/container/detail/singleton.hpp>
 
-#define T_SENSOR_INFO(x) T_SENSOR_INFO[T_SENSOR_INFO_##x]
-#define T_DATA_INFO(x) T_DATA_INFO[T_DATA_INFO_##x]
-#define T_DATASTATIC_INFO(x) T_DATASTATIC_INFO[T_DATASTATIC_INFO_##x]
-#define T_GATEWAY_INFO(x) T_GATEWAY_INFO[T_GATEWAY_INFO_##x]
-#define T_DATANODE_TIME(x) T_DATANODE_TIME[T_DATANODE_TIME_##x]
-#define T_BATTERY_INFO(x) T_BATTERY_INFO[T_BATTERY_INFO_##x]
+extern const char *T_SENSOR_INFO1[];
+extern const char *T_DATA_INFO1[];
+extern const char *T_DATASTATIC_INFO1[];
+extern const char *T_DATANODE_TIME1[];
+extern const char *T_GATEWAY_INFO1[];
+extern const char *T_BATTERY_INFO1[];
+
+#define T_SENSOR_INFO(x) T_SENSOR_INFO1[T_SENSOR_INFO_##x]
+#define T_DATA_INFO(x) T_DATA_INFO1[T_DATA_INFO_##x]
+#define T_DATASTATIC_INFO(x) T_DATASTATIC_INFO1[T_DATASTATIC_INFO_##x]
+#define T_GATEWAY_INFO(x) T_GATEWAY_INFO1[T_GATEWAY_INFO_##x]
+#define T_DATANODE_TIME(x) T_DATANODE_TIME1[T_DATANODE_TIME_##x]
+#define T_BATTERY_INFO(x) T_BATTERY_INFO1[T_BATTERY_INFO_##x]
 
 typedef std::map<std::string, std::string> map_t;
 typedef std::vector<std::string> vec_t;
@@ -106,9 +113,6 @@ typedef enum {
     T_SENSOR_INFO_VIFF,
     T_SENSOR_INFO_RSSI
 } T_SENSOR_INFO_Index;
-const static char *T_SENSOR_INFO[] = {"t_sensor_info", "dataNodeNo",     "dataNodeName",    "initFlag",       "accFlag",       "zigbeeFlag",      "temTopFlag",   "temBotFlag",   "equipSta", "hardVersion", "softVersion",      "bpNo",
-                                      "serialNo",      "firstPowerTime", "configFlag",      "startBrands",    "stopBrands",    "featureInterVal", "waveInterVal", "samplingRate", "scope",    "range",       "envelopeBandPass", "faultFrequency",
-                                      "zigbeePanId",   "zigbeeChannel",  "zigbeeShortAddr", "zigbeeLongAddr", "zigbeeDesAddr", "status",          "timeStamp",    "viff",         "RSSI"};
 
 typedef enum {
     T_DATA_INFO_TNAME = 0,
@@ -133,8 +137,6 @@ typedef enum {
     T_DATA_INFO_SENDMSG,
     T_DATA_INFO_NODERESEND
 } T_DATA_INFO_Index;
-const static char *T_DATA_INFO[] = {"t_data_info", "dataNodeNo", "channelID", "diagnosisPk", "integratPk", "integratRMS", "rmsValues",   "envelopEnergy", "Amp1",    "Amp2",      "Amp3",
-                                    "Amp4",        "Amp5",       "Phase1",    "Phase2",      "Phase3",     "Phase4",      "StaticIndex", "timeStamp",     "sendMsg", "nodeResend"};
 
 typedef enum {
     T_DATASTATIC_INFO_TNAME = 0,
@@ -149,7 +151,6 @@ typedef enum {
     T_DATASTATIC_INFO_SENDMSG,
     T_DATASTATIC_INFO_NODERESEND
 } T_DATASTATIC_INFO_Index;
-const static char *T_DATASTATIC_INFO[] = {"t_datastatic_info", "dataNodeNo", "channelID", "temTop", "temBot", "dip", "voltage", "StaticIndex", "timeStamp", "sendMsg", "nodeResend"};
 
 typedef enum {
     T_DATANODE_TIME_TNAME = 0,
@@ -163,7 +164,6 @@ typedef enum {
     T_DATANODE_TIME_STATICTIME,
     T_DATANODE_TIME_STATICSTARTTIME
 } T_DATANODE_TIME_Index;
-const static char *T_DATANODE_TIME[] = {"t_datanode_time", "dataNodeNo", "shortaddr", "staticcycle", "wavecycle", "nodegroup", "nodeindex", "nodewaveindex", "statictime", "staticstarttime"};
 
 typedef enum {
     T_GATEWAY_INFO_TNAME = 0,
@@ -184,8 +184,6 @@ typedef enum {
     T_GATEWAY_INFO_GATEWAYUPDATE,
     T_GATEWAY_INFO_MAC2,
 } T_GATEWAY_INFO_Index;
-const static char *T_GATEWAY_INFO[] = {"t_gateway_info", "gatewayMAC",     "sensorVersion", "gatewayLocation", "zigbeePanID", "zigbeeChannel", "communicationType", "signal", "localIP",
-                                       "systemVersion",  "programVersion", "webVersion",    "serverIP",        "serverPort",  "status",        "gateWayUpdate",     "MAC2"};
 
 typedef enum {
     T_BATTERY_INFO_TNAME = 0,
@@ -200,5 +198,5 @@ typedef enum {
     T_BATTERY_INFO_TIMESTAMP
 
 } T_BATTERY_INFO_Index;
-const static char *T_BATTERY_INFO[] = {"t_battery_info", "dataNodeNo", "Dip", "temBot", "nodeWorkTime", "nodeSendTime", "batteryVoltage", "batteryUsage", "batteryRemain", "timeStamp"};
+
 #endif // SQL_DB_HPP_
diff --git a/jsonparse/communication_cmd.hpp b/jsonparse/communication_cmd.hpp
index 526bf0e..1f900e3 100644
--- a/jsonparse/communication_cmd.hpp
+++ b/jsonparse/communication_cmd.hpp
@@ -6,24 +6,6 @@
 #include <json/json.h>
 #include "common/parameter_defination.hpp"
 
-// cmd  "20"
-static const char *JSON_FIELD_CMD = "cmd";                  //协议:    命令字段
-static const char *JSON_FIELD_NAME = "dataNodeGatewayName"; //协议: 终端名称
-static const char *JSON_FIELD_dataNodeGatewayNo = "dataNodeGatewayNo";
-static const char *JSON_FIELD_ASSETID = "dataNodeGatewayAssetId"; //协议:    资产编号  字段
-static const char *JSON_FIELD_ADDEDBY = "dataNodeGatewayAddedBy"; //协议:    添加人  字段
-static const char *JSON_FIELD_DEVICETYPE = "deviceType";
-static const char *JSON_FIELD_ADDEDDATE = "dataNodeGatewayAddedDate";
-static const char *JSON_FIELD_IPADDRESS = "dataNodeGatewayIpAddress";
-static const char *JSON_FIELD_SN = "serialNumber";
-static const char *JSON_FIELD_VERSION = "softVersion";
-static const char *JSON_FIELD_TIMEZONE = "timezone";
-
-// cmd  "23"
-static const char *JSON_FIELD_SERVERIP = "localServerIpAddress";
-static const char *JSON_FIELD_SERVERPORT = "localServerPort";
-static const char *JSON_FIELD_CommMode = "CommMode";
-
 class JsonData {
 public:
 
diff --git a/jsonparse/mqtt_cmd_parse.cpp b/jsonparse/mqtt_cmd_parse.cpp
index a1f75d2..d0e6b34 100644
--- a/jsonparse/mqtt_cmd_parse.cpp
+++ b/jsonparse/mqtt_cmd_parse.cpp
@@ -9,6 +9,24 @@
 
 extern zlog_category_t *zct;
 
+// cmd  "20"
+const char *JSON_FIELD_CMD = "cmd";                  //协议:    命令字段
+const char *JSON_FIELD_NAME = "dataNodeGatewayName"; //协议: 终端名称
+const char *JSON_FIELD_dataNodeGatewayNo = "dataNodeGatewayNo";
+const char *JSON_FIELD_ASSETID = "dataNodeGatewayAssetId"; //协议:    资产编号  字段
+const char *JSON_FIELD_ADDEDBY = "dataNodeGatewayAddedBy"; //协议:    添加人  字段
+const char *JSON_FIELD_DEVICETYPE = "deviceType";
+const char *JSON_FIELD_ADDEDDATE = "dataNodeGatewayAddedDate";
+const char *JSON_FIELD_IPADDRESS = "dataNodeGatewayIpAddress";
+const char *JSON_FIELD_SN = "serialNumber";
+const char *JSON_FIELD_VERSION = "softVersion";
+const char *JSON_FIELD_TIMEZONE = "timezone";
+
+// cmd  "23"
+const char *JSON_FIELD_SERVERIP = "localServerIpAddress";
+const char *JSON_FIELD_SERVERPORT = "localServerPort";
+const char *JSON_FIELD_CommMode = "CommMode";
+
 std::string JsonData::JsonCmd_20(Param_20 &param) {
     Json::Value jsonVal;
     jsonVal.clear();
diff --git a/jsonparse/web_cmd_parse.cpp b/jsonparse/web_cmd_parse.cpp
index 2cd2abb..711ea8a 100644
--- a/jsonparse/web_cmd_parse.cpp
+++ b/jsonparse/web_cmd_parse.cpp
@@ -7,6 +7,18 @@
 #include "utility/md5.h"
 
 extern zlog_category_t *zct;
+extern const char *JSON_FIELD_CMD;
+extern const char *JSON_FIELD_NAME;
+extern const char *JSON_FIELD_dataNodeGatewayNo;
+extern const char *JSON_FIELD_ASSETID;
+extern const char *JSON_FIELD_ADDEDBY;
+extern const char *JSON_FIELD_DEVICETYPE;
+extern const char *JSON_FIELD_ADDEDDATE;
+extern const char *JSON_FIELD_IPADDRESS;
+extern const char *JSON_FIELD_SN;
+extern const char *JSON_FIELD_VERSION;
+extern const char *JSON_FIELD_TIMEZONE;
+
 
 std::string JsonData::JsonCmd_Cgi_01(Param_01 &param) {
     Json::Value jsonVal;
diff --git a/jsonparse/web_cmd_parse3.cpp b/jsonparse/web_cmd_parse3.cpp
index 0e57755..a3ba524 100644
--- a/jsonparse/web_cmd_parse3.cpp
+++ b/jsonparse/web_cmd_parse3.cpp
@@ -10,6 +10,7 @@
 #include "utility/calculation.hpp"
 
 extern zlog_category_t *zct;
+extern const char *JSON_FIELD_CMD;
 
 std::string JsonData::JsonCmd_Cgi_default() {
     Json::Value jsonVal;
diff --git a/threadfunc/thread_func.cpp b/threadfunc/thread_func.cpp
index 8ee23f2..d788e52 100644
--- a/threadfunc/thread_func.cpp
+++ b/threadfunc/thread_func.cpp
@@ -261,7 +261,7 @@ void WatchDog() {
     }
     close(fd);
 }
-static const char *LOCAL_WILL_TOPIC = "up/uart/will";
+//static const char *LOCAL_WILL_TOPIC = "up/uart/will";
 void my_publish_callback(struct mosquitto *mosq, void *obj, int mid) {}
 
 void my_connect_callback(struct mosquitto *mosq, void *obj, int result) {