Browse Source

Clang supports nested structure initialization

Source commit: 16ef6d860e60a57b46551a89a2a10d9880429371
Martin Prikryl 1 week ago
parent
commit
87b18e3620
1 changed files with 2 additions and 7 deletions
  1. 2 7
      source/core/S3FileSystem.cpp

+ 2 - 7
source/core/S3FileSystem.cpp

@@ -1847,11 +1847,6 @@ static _di_IXMLNode S3NeedNode(const _di_IXMLNodeList & NodeList, const UnicodeS
   return NeedNode(NodeList, Name, S3Namespace);
 }
 //---------------------------------------------------------------------------
-#define COPY_BUCKET_CONTEXT(BucketContext) \
-  { BucketContext.hostName, BucketContext.bucketName, BucketContext.protocol, BucketContext.uriStyle, \
-    BucketContext.accessKeyId, BucketContext.secretAccessKey, BucketContext.securityToken, BucketContext.authRegion, \
-    BucketContext.service }
-//---------------------------------------------------------------------------
 bool TS3FileSystem::DoLoadFileProperties(
   const UnicodeString & AFileName, const TRemoteFile * File, TS3FileProperties & Properties, bool LoadTags)
 {
@@ -1882,7 +1877,7 @@ bool TS3FileSystem::DoLoadFileProperties(
       RequestParams TaggingRequestParams =
       {
         HttpRequestTypeGET,
-        COPY_BUCKET_CONTEXT(BucketContext),
+        BucketContext,
         KeyBuf.c_str(),
         NULL,
         "tagging",
@@ -2060,7 +2055,7 @@ void __fastcall TS3FileSystem::ChangeFileProperties(const UnicodeString FileName
       RequestParams TaggingRequestParams =
       {
         HttpRequestTypePUT,
-        COPY_BUCKET_CONTEXT(BucketContext),
+        BucketContext,
         KeyBuf.c_str(),
         NULL,
         "tagging",