pdxx
/
fastdfs
mirror of https://github.com/happyfish100/fastdfs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove compile warnings

master V6.12.1
YuQing 2024-03-11 15:25:41 +08:00
parent 10aa9a8de8
commit 75c5535f5a
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
client/storage_client.c
View File

@ -923,7 +923,7 @@ int storage_do_upload_file(ConnectionInfo *pTrackerServer, \
char formatted_ip[FORMATTED_IP_SIZE];
char *pInBuff;
ConnectionInfo storageServer;
bool new_connection;
bool new_connection = false;
bool bUploadSlave;
int new_store_path;
int master_filename_len;
@ -952,20 +952,23 @@ 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)
{
*group_name = '\0';
return result;
}
else
{
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';
@ -1269,8 +1272,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;

2
storage/storage_service.c
View File

@ -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)