From e6ec41ba049d414964233495c3ef06a93f6eaaf9 Mon Sep 17 00:00:00 2001
From: YuQing <384681@qq.com>
Date: Tue, 24 Dec 2019 22:12:40 +0800
Subject: [PATCH] static variable expect_header

---
 storage/storage_dio.c         | 17 ++++++++---------
 storage/trunk_mgr/trunk_mem.c |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/storage/storage_dio.c b/storage/storage_dio.c
index 0b9ccd5..56a6c59 100644
--- a/storage/storage_dio.c
+++ b/storage/storage_dio.c
@@ -814,35 +814,34 @@ int dio_check_trunk_file_ex(int fd, const char *filename, const int64_t offset)
 {
 	int result;
 	char old_header[FDFS_TRUNK_FILE_HEADER_SIZE];
-	char expect_header[FDFS_TRUNK_FILE_HEADER_SIZE];
+	static char expect_header[FDFS_TRUNK_FILE_HEADER_SIZE] = {'\0'};
 
 	if (fc_safe_read(fd, old_header, FDFS_TRUNK_FILE_HEADER_SIZE) !=
 		FDFS_TRUNK_FILE_HEADER_SIZE)
 	{
 		result = errno != 0 ? errno : EIO;
-		logError("file: "__FILE__", line: %d, " \
-			"read trunk header of file: %s fail, " \
-			"errno: %d, error info: %s", \
-			__LINE__, filename, \
+		logError("file: "__FILE__", line: %d, "
+			"read trunk header of file: %s fail, "
+			"errno: %d, error info: %s",
+			__LINE__, filename,
 			result, STRERROR(result));
 		return result;
 	}
 
-	memset(expect_header, 0, sizeof(expect_header));
-	if (memcmp(old_header, expect_header, \
+	if (memcmp(old_header, expect_header,
 		FDFS_TRUNK_FILE_HEADER_SIZE) != 0)
 	{
 		FDFSTrunkHeader srcOldTrunkHeader;
 		FDFSTrunkHeader newOldTrunkHeader;
 
 		trunk_unpack_header(old_header, &srcOldTrunkHeader);
-		memcpy(&newOldTrunkHeader, &srcOldTrunkHeader, \
+		memcpy(&newOldTrunkHeader, &srcOldTrunkHeader,
 			sizeof(FDFSTrunkHeader));
 		newOldTrunkHeader.alloc_size = 0;
 		newOldTrunkHeader.file_size = 0;
 		newOldTrunkHeader.file_type = 0;
 		trunk_pack_header(&newOldTrunkHeader, old_header);
-		if (memcmp(old_header, expect_header, \
+		if (memcmp(old_header, expect_header,
 			FDFS_TRUNK_FILE_HEADER_SIZE) != 0)
 		{
 			char buff[256];
diff --git a/storage/trunk_mgr/trunk_mem.c b/storage/trunk_mgr/trunk_mem.c
index c048ed7..135869c 100644
--- a/storage/trunk_mgr/trunk_mem.c
+++ b/storage/trunk_mgr/trunk_mem.c
@@ -2540,7 +2540,7 @@ int trunk_file_delete(const char *trunk_filename, \
 	remain_bytes = pTrunkInfo->file.size - FDFS_TRUNK_FILE_HEADER_SIZE;
 	while (remain_bytes > 0)
 	{
-		write_bytes = remain_bytes > sizeof(buff) ? \
+		write_bytes = remain_bytes > sizeof(buff) ?
 				sizeof(buff) : remain_bytes;
 		if (fc_safe_write(fd, buff, write_bytes) != write_bytes)
 		{