From 5ebfc0bc45b3ee876e4be3b48ac60bbc58fb287d Mon Sep 17 00:00:00 2001 From: Wanderingss <1624155937@qq.com> Date: Thu, 19 Nov 2026 11:45:31 +0800 Subject: [PATCH] =?UTF-8?q?chore(iec60870):=20=E5=88=A0=E9=99=A4=E7=AC=AC?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E5=BF=AB=E7=85=A7=208=20=E4=B8=AA=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E5=B0=BE=E9=83=A8=E7=A9=BA=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit end-of-file-fixer 每次 pre_commit --all-files 都会重写 IEC60870-Slave/ 下这 8 个 文件(各删 1~2 个尾部空行),使工作区在没有任何人改动的情况下反复变脏,进而 让「合并后工作区是否干净」的判定失真。 本次把这批抖动一次性落库:numstat 全为 0 增 / 1~2 删,逐文件把尾部空行剔除后 与 HEAD 内容 md5 完全一致(8/8 一致、0 不一致),确认零语义改动。 该目录是 104 协议栈的供应商快照(208 个跟踪文件、31 MB),不进 Keil 构建 (uvprojx 命中 0)、不进模拟器(CMakeLists 命中 0),仅被 test/host/iec104_dtu 的 oracle.py 与 run_transport_test.py 当参考语料引用。 --- IEC60870-Slave/104/business/IEC104_Spontaneous.c | 1 - IEC60870-Slave/common/IEC60870_Codec.c | 1 - IEC60870-Slave/common/IEC60870_InformationObjects.c | 1 - IEC60870-Slave/common/IEC60870_InformationObjects.h | 1 - IEC60870-Slave/common/IEC60870_InformationObjects_Internal.h | 1 - IEC60870-Slave/examples/iec104_dtu_profile.h | 1 - IEC60870-Slave/test/iec104_file_service_test.c | 2 -- IEC60870-Slave/test/iec60870_asdu_extended_test.c | 1 - 8 files changed, 9 deletions(-) diff --git a/IEC60870-Slave/104/business/IEC104_Spontaneous.c b/IEC60870-Slave/104/business/IEC104_Spontaneous.c index 022d8a42..9a04ed8f 100644 --- a/IEC60870-Slave/104/business/IEC104_Spontaneous.c +++ b/IEC60870-Slave/104/business/IEC104_Spontaneous.c @@ -1058,4 +1058,3 @@ IEC104_SpontaneousPublishResult_t IEC104_Spontaneous_Publish_Fault_Event( Spontaneous_Account(self, &before.normal_queue, submitted == IEC104_TCP_SUBMIT_OK ? 1U : 0U); return result; } - diff --git a/IEC60870-Slave/common/IEC60870_Codec.c b/IEC60870-Slave/common/IEC60870_Codec.c index 0f36fced..87b78ec1 100644 --- a/IEC60870-Slave/common/IEC60870_Codec.c +++ b/IEC60870-Slave/common/IEC60870_Codec.c @@ -191,4 +191,3 @@ int IEC60870_Parse_ASDU_Header(const IEC60870_AppLayerParameters_t *parameters, return 1; } - diff --git a/IEC60870-Slave/common/IEC60870_InformationObjects.c b/IEC60870-Slave/common/IEC60870_InformationObjects.c index 3992306c..7cefc1f8 100644 --- a/IEC60870-Slave/common/IEC60870_InformationObjects.c +++ b/IEC60870-Slave/common/IEC60870_InformationObjects.c @@ -7552,4 +7552,3 @@ IEC60870_AsduResult_t IEC60870_InformationObject_Decode(uint8_t type_id, uint32_ default: return IEC60870_ASDU_UNSUPPORTED; } } - diff --git a/IEC60870-Slave/common/IEC60870_InformationObjects.h b/IEC60870-Slave/common/IEC60870_InformationObjects.h index afb4cfc7..b7fafdaa 100644 --- a/IEC60870-Slave/common/IEC60870_InformationObjects.h +++ b/IEC60870-Slave/common/IEC60870_InformationObjects.h @@ -2067,4 +2067,3 @@ IEC60870_AsduResult_t IEC60870_TestCommandWithCP56Time2a_Get_From_Buffer(IEC6087 #endif #endif /* IEC60870_INFORMATION_OBJECTS_H */ - diff --git a/IEC60870-Slave/common/IEC60870_InformationObjects_Internal.h b/IEC60870-Slave/common/IEC60870_InformationObjects_Internal.h index e0957af2..ac04480a 100644 --- a/IEC60870-Slave/common/IEC60870_InformationObjects_Internal.h +++ b/IEC60870-Slave/common/IEC60870_InformationObjects_Internal.h @@ -91,4 +91,3 @@ static inline uint32_t IEC60870_Object_Max_IOA(const IEC60870_AppLayerParameters } #endif /* IEC60870_INFORMATION_OBJECTS_INTERNAL_H */ - diff --git a/IEC60870-Slave/examples/iec104_dtu_profile.h b/IEC60870-Slave/examples/iec104_dtu_profile.h index f204c3b7..39e8728e 100644 --- a/IEC60870-Slave/examples/iec104_dtu_profile.h +++ b/IEC60870-Slave/examples/iec104_dtu_profile.h @@ -637,4 +637,3 @@ static const DtuProfileParameter dtu_parameters[] = { #define DTU_PARAMETER_COUNT (sizeof(dtu_parameters) / sizeof(dtu_parameters[0])) #endif - diff --git a/IEC60870-Slave/test/iec104_file_service_test.c b/IEC60870-Slave/test/iec104_file_service_test.c index 97b2b9e3..d4f835d0 100644 --- a/IEC60870-Slave/test/iec104_file_service_test.c +++ b/IEC60870-Slave/test/iec104_file_service_test.c @@ -1664,5 +1664,3 @@ int main(void) (unsigned)IEC104_TCP_SERVER_CAPACITY,(unsigned)IEC104_FILE_SERVICE_TASK_CAPACITY,(unsigned)IEC104_FILE_SERVICE_SEGMENT_CAPACITY); return 0; } - - diff --git a/IEC60870-Slave/test/iec60870_asdu_extended_test.c b/IEC60870-Slave/test/iec60870_asdu_extended_test.c index f4b427cf..d7053210 100644 --- a/IEC60870-Slave/test/iec60870_asdu_extended_test.c +++ b/IEC60870-Slave/test/iec60870_asdu_extended_test.c @@ -940,4 +940,3 @@ int main(void) printf("Extended ASDU: %d groups passed (39 additional types, short times, variable file segments)\n", passed); return 0; } -