99 lines
4.2 KiB
Diff
99 lines
4.2 KiB
Diff
From 8dad60feacfc28d092a0de066eba4e2a41dfe616 Mon Sep 17 00:00:00 2001
|
|
From: lizhenhua <lizhenhua@sina.com>
|
|
Date: Wed, 20 May 2020 13:49:21 +0800
|
|
Subject: [PATCH] Fix compile errors
|
|
|
|
---
|
|
ext_libs/muparser/muParserCallback.cpp | 16 ++++++++++++++++
|
|
ext_libs/muparser/muParserCallback.h | 1 +
|
|
mlxfwops/lib/fw_ops.cpp | 10 +++-------
|
|
small_utils/mtserver.c | 4 ++--
|
|
4 files changed, 22 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/ext_libs/muparser/muParserCallback.cpp b/ext_libs/muparser/muParserCallback.cpp
|
|
index 8db3c1d..2040efe 100644
|
|
--- a/ext_libs/muparser/muParserCallback.cpp
|
|
+++ b/ext_libs/muparser/muParserCallback.cpp
|
|
@@ -392,6 +392,22 @@ ParserCallback::ParserCallback(const ParserCallback& ref)
|
|
m_eOprtAsct = ref.m_eOprtAsct;
|
|
}
|
|
|
|
+ParserCallback& ParserCallback::operator=(const ParserCallback& cb)
|
|
+{
|
|
+ if (this != &cb)
|
|
+ {
|
|
+ m_pFun = cb.m_pFun;
|
|
+ m_iArgc = cb.m_iArgc;
|
|
+ m_bAllowOpti = cb.m_bAllowOpti;
|
|
+ m_iCode = cb.m_iCode;
|
|
+ m_iType = cb.m_iType;
|
|
+ m_iPri = cb.m_iPri;
|
|
+ m_eOprtAsct = cb.m_eOprtAsct;
|
|
+ }
|
|
+
|
|
+ return *this;
|
|
+}
|
|
+
|
|
//---------------------------------------------------------------------------
|
|
/** \brief Clone this instance and return a pointer to the new instance. */
|
|
ParserCallback* ParserCallback::Clone() const
|
|
diff --git a/ext_libs/muparser/muParserCallback.h b/ext_libs/muparser/muParserCallback.h
|
|
index d756099..913e059 100644
|
|
--- a/ext_libs/muparser/muParserCallback.h
|
|
+++ b/ext_libs/muparser/muParserCallback.h
|
|
@@ -80,6 +80,7 @@ public:
|
|
ParserCallback(strfun_type3 a_pFun, bool a_bAllowOpti);
|
|
ParserCallback();
|
|
ParserCallback(const ParserCallback& a_Fun);
|
|
+ ParserCallback& operator=(const ParserCallback& cb);
|
|
|
|
ParserCallback* Clone() const;
|
|
|
|
diff --git a/mlxfwops/lib/fw_ops.cpp b/mlxfwops/lib/fw_ops.cpp
|
|
index ea3ca19..d26d6c7 100644
|
|
--- a/mlxfwops/lib/fw_ops.cpp
|
|
+++ b/mlxfwops/lib/fw_ops.cpp
|
|
@@ -879,21 +879,17 @@ void FwOperations::BackUpFwParams(fw_ops_params_t& fwParams)
|
|
_fwParams.errBuffSize = 0;
|
|
_fwParams.fileHndl =
|
|
(fwParams.hndlType == FHT_FW_FILE && fwParams.fileHndl) ?
|
|
- strncpy((char*)(new char[(strlen(fwParams.fileHndl) + 1)]), fwParams.fileHndl, strlen(fwParams.fileHndl) + 1) :
|
|
- (char*)NULL;
|
|
+ (char*)memmove((new char[(strlen(fwParams.fileHndl) + 1)]), fwParams.fileHndl, strlen(fwParams.fileHndl) + 1) : (char*)NULL;
|
|
// no support for flash params
|
|
_fwParams.flashParams = (flash_params_t*)NULL;
|
|
_fwParams.forceLock = fwParams.forceLock;
|
|
_fwParams.ignoreCacheRep = fwParams.ignoreCacheRep;
|
|
_fwParams.mstHndl =
|
|
(fwParams.hndlType == FHT_MST_DEV && fwParams.mstHndl) ?
|
|
- strncpy((char*)(new char[(strlen(fwParams.mstHndl) + 1)]), fwParams.mstHndl, strlen(fwParams.mstHndl) + 1) :
|
|
- (char*)NULL;
|
|
+ (char*)memmove((new char[(strlen(fwParams.mstHndl) + 1)]), fwParams.mstHndl, strlen(fwParams.mstHndl) + 1) : (char*)NULL;
|
|
_fwParams.noFlashVerify = fwParams.noFlashVerify;
|
|
_fwParams.numOfBanks = fwParams.numOfBanks;
|
|
- _fwParams.psid = fwParams.psid ? strncpy((char*)(new char[(strlen(fwParams.psid) + 1)]), fwParams.psid,
|
|
- strlen(fwParams.psid) + 1) :
|
|
- (char*)NULL;
|
|
+ _fwParams.psid = fwParams.psid ? (char*)memmove((new char[(strlen(fwParams.psid) + 1)]), fwParams.psid, strlen(fwParams.psid) + 1) : (char*)NULL;
|
|
_fwParams.readOnly = fwParams.readOnly;
|
|
_fwParams.shortErrors = fwParams.shortErrors;
|
|
_fwParams.uefiExtra = fwParams.uefiExtra;
|
|
diff --git a/small_utils/mtserver.c b/small_utils/mtserver.c
|
|
index d75ec2e..8026ce5 100644
|
|
--- a/small_utils/mtserver.c
|
|
+++ b/small_utils/mtserver.c
|
|
@@ -714,8 +714,8 @@ int parse_i2c_cmd(char* buf,
|
|
{
|
|
char tmp_num[10];
|
|
// TODO: use 16 on the strtoul
|
|
- strncpy(tmp_num, "0x", 3);
|
|
- strncpy(tmp_num + 2, p, 2);
|
|
+ memmove(tmp_num, "0x", 3);
|
|
+ memmove(tmp_num + 2, p, 2);
|
|
tmp_num[4] = '\0';
|
|
((u_int8_t*)data)[i] = (u_int8_t)strtoul(tmp_num, 0, 0);
|
|
p += 2;
|
|
--
|
|
2.27.0
|
|
|