From 75c5535f5a9853dfe8302cd5852bb36bc518fde5 Mon Sep 17 00:00:00 2001
From: YuQing <384681@qq.com>
Date: Mon, 11 Mar 2024 15:25:41 +0800
Subject: [PATCH] remove compile warnings

---
 client/storage_client.c   | 23 +++++++++++++----------
 storage/storage_service.c |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/client/storage_client.c b/client/storage_client.c
index 5acfa9b..6f05742 100644
--- a/client/storage_client.c
+++ b/client/storage_client.c
@@ -919,7 +919,7 @@ int storage_do_upload_file(ConnectionInfo *pTrackerServer, \
 	char in_buff[128];
 	char *pInBuff;
 	ConnectionInfo storageServer;
-	bool new_connection;
+	bool new_connection = false;
 	bool bUploadSlave;
 	int new_store_path;
 	int master_filename_len;
@@ -948,19 +948,22 @@ int storage_do_upload_file(ConnectionInfo *pTrackerServer, \
 	bUploadSlave = (strlen(group_name) > 0 && master_filename_len > 0);
 	if (bUploadSlave)
 	{
-		if ((result=storage_get_update_connection(pTrackerServer, \
-			&pStorageServer, group_name, master_filename, \
+		if ((result=storage_get_update_connection(pTrackerServer,
+			&pStorageServer, group_name, master_filename,
 			&storageServer, &new_connection)) != 0)
 		{
 			return result;
 		}
 	}
-	else if ((result=storage_get_upload_connection(pTrackerServer, \
-		&pStorageServer, group_name, &storageServer, \
-		&new_store_path, &new_connection)) != 0)
+	else
 	{
-		*group_name = '\0';
-		return result;
+	        if ((result=storage_get_upload_connection(pTrackerServer,
+		        &pStorageServer, group_name, &storageServer,
+		        &new_store_path, &new_connection)) != 0)
+	        {
+		        *group_name = '\0';
+		        return result;
+	        }
 	}
 
 	*group_name = '\0';
@@ -1264,8 +1267,8 @@ int storage_set_metadata(ConnectionInfo *pTrackerServer, \
 	char *pEnd;
 	bool new_connection;
 
-	if ((result=storage_get_update_connection(pTrackerServer, \
-		&pStorageServer, group_name, filename, \
+	if ((result=storage_get_update_connection(pTrackerServer,
+		&pStorageServer, group_name, filename,
 		&storageServer, &new_connection)) != 0)
 	{
 		return result;
diff --git a/storage/storage_service.c b/storage/storage_service.c
index 0a0ae82..5eea899 100644
--- a/storage/storage_service.c
+++ b/storage/storage_service.c
@@ -1783,7 +1783,7 @@ void storage_get_store_path(const char *filename, const int filename_len, \
 	{ \
 		int r; \
 		r = (rand() & 0x007FFFFF) | 0x80000000; \
-		masked_file_size = (((int64_t)r) << 32 ) | file_size; \
+		masked_file_size = (((int64_t)r) << 32 ) | (file_size); \
 	} while (0)
 
 
-- 
2.27.0

