Explorar o código

[cloud] some fixes

Exilon %!s(int64=3) %!d(string=hai) anos
pai
achega
c45e315d0c
Modificáronse 2 ficheiros con 7 adicións e 21 borrados
  1. 7 20
      Quick.Amazon.pas
  2. 0 1
      Quick.Azure.pas

+ 7 - 20
Quick.Amazon.pas

@@ -102,7 +102,6 @@ type
       procedure SetAmazonProtocol(amProtocol : TAmazonProtocol);
       procedure SetAWSRegion(Value : TAmazonRegion);
       function FileToArray(cFilename : string) : TArray<Byte>;
-      function StreamToArray(cStream : TStream) : TArray<Byte>;
       function ByteContent(DataStream: TStream): TBytes;
     public
       constructor Create; overload;
@@ -127,8 +126,9 @@ type
       function DeleteBucket(amBucket : string; amBucketRegion : TAmazonRegion; var amResponseInfo : TAmazonResponseInfo) : Boolean;
       {$IFNDEF DELPHISYDNEY_UP}
       class function GetAWSRegion(Region: TAmazonRegion): string; overload;
-      {$ENDIF}
+      {$ELSE}
       class function GetAWSRegion(const Region : string) : TAmazonRegion; overload;
+      {$ENDIF}
   end;
 
 implementation
@@ -210,19 +210,6 @@ begin
   end;
 end;
 
-function TQuickAmazon.StreamToArray(cStream : TStream) : TArray<Byte>;
-var
-  bs : TBytesStream;
-begin
-  bs := TBytesStream.Create(Result);
-  try
-    bs.LoadFromStream(cStream);
-    Result := bs.Bytes;
-  finally
-    bs.Free
-  end;
-end;
-
 function TQuickAmazon.ByteContent(DataStream: TStream): TBytes;
 var
   Buffer: TBytes;
@@ -606,16 +593,16 @@ begin
   end;
 end;
 
-class function TQuickAmazon.GetAWSRegion(const Region : string) : TAmazonRegion;
-begin
-  Result := TAmazonStorageService.GetRegionFromString(Region);
-end;
-
 {$IFNDEF DELPHISYDNEY_UP}
 class function TQuickAmazon.GetAWSRegion(Region: TAmazonRegion): string;
 begin
   Result := TAmazonStorageService.GetRegionString(Region);
 end;
+{$ELSE}
+class function TQuickAmazon.GetAWSRegion(const Region : string) : TAmazonRegion;
+begin
+  Result := TAmazonStorageService.GetRegionFromString(Region);
+end;
 {$ENDIF}
 
 end.

+ 0 - 1
Quick.Azure.pas

@@ -162,7 +162,6 @@ end;
 function TQuickAzure.FileToArray(cFilename : string) : TArray<Byte>;
 var
   fs : TFileStream;
-  bs : TBytesStream;
 begin
   fs := TFileStream.Create(cFilename, fmOpenRead);
   try