diff options
| -rw-r--r-- | UCoreWorkers.pas | 12 | ||||
| -rw-r--r-- | UEngines.pas | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/UCoreWorkers.pas b/UCoreWorkers.pas index 00b0672..7c0fb02 100644 --- a/UCoreWorkers.pas +++ b/UCoreWorkers.pas @@ -1059,7 +1059,7 @@ var DefResponse: integer; // Global variables for this function // * TODO: set real error, also free it Res := CopyFilesWorker_ErrorFunc(Self, 7, 1 { Error }, DestFile); // Cannot write to source file end; - Inc(BytesDone, BytesRead); + BytesDone := BytesDone + BytesRead; if not CopyFilesWorker_ProgressFunc(Self, BytesDone, nil) then begin Res := False; Break; @@ -1498,7 +1498,7 @@ begin if List.Count > 0 then for i := 0 to List.Count - 1 do if PDataItemSL(List[i])^.Stage1 and (PDataItemSL(List[i])^.DataItem^.Size > 0) and (not PDataItemSL(List[i])^.DataItem^.IsDir) and (not PDataItemSL(List[i])^.DataItem^.IsLnk) - then Inc(FTotalSize, PDataItemSL(List[i])^.DataItem^.Size); + then FTotalSize := FTotalSize + PDataItemSL(List[i])^.DataItem^.Size; SrcEngine.BlockSize := ComputeBlockSize(FTotalSize); DestEngine.BlockSize := ComputeBlockSize(FTotalSize); @@ -1550,7 +1550,7 @@ begin Break; end; if (not PDataItemSL(List[i])^.DataItem^.IsDir) and (not PDataItemSL(List[i])^.DataItem^.IsLnk) - then Inc(FTotalDone, PDataItemSL(List[i])^.DataItem^.Size); + then FTotalDone := FTotalDone + PDataItemSL(List[i])^.DataItem^.Size; if FCancelled then begin FCancelMessage := LANGUserCancelled; FShowCancelMessage := True; @@ -1636,7 +1636,7 @@ var FD: TEngineFileDes; end; CurrentCRC := CRC32(CurrentCRC, Buffer, Count); UpdateProgress1(FProgress1Pos + Count, Format('%d %%', [Trunc((FProgress1Pos + Count) / FProgress1Max * 100)])); - Inc(SizeDone, Count); + SizeDone := SizeDone + Count; if MergeHasInitialCRC then UpdateProgress2(SizeDone, Format('%d %%', [Trunc(SizeDone / FProgress2Max * 100)])); CommitGUIUpdate; until (Count < MergeBlockSize) or FCancelled; @@ -1788,7 +1788,7 @@ var FD: TEngineFileDes; end; // * TODO: check error wCount := AEngine.WriteFile(FDW, Buffer, Count, @Error); - Inc(Written, wCount); + Written := Written + wCount; FileCRC := CRC32(FileCRC, Buffer, wCount); if (Error <> nil) or (Count <> wCount) then begin // * TODO: set real error, also free it @@ -1945,7 +1945,7 @@ begin PrivateCancel := True; Break; end; - Inc(SizeDone, ws); + SizeDone := SizeDone + ws; if SplitMaxSize > 0 then UpdateProgress2(SizeDone, Format('%d %%', [Trunc(SizeDone / FileSize * 100)])) else UpdateProgress1(SizeDone, Format('%d %%', [Trunc(SizeDone / FileSize * 100)])); CommitGUIUpdate; diff --git a/UEngines.pas b/UEngines.pas index 3db0c25..24eee1a 100644 --- a/UEngines.pas +++ b/UEngines.pas @@ -409,9 +409,9 @@ function TLocalTreeEngine.GetDirSize(const APath: string): Int64; memset(StatBuf, 0, sizeof(Tstat64)); if lstat64(Buf, StatBuf) = 0 then begin if __S_ISTYPE(StatBuf^.st_mode, __S_IFDIR) then begin - Inc(Result, InternalGetDirSize(APath + string(Buf))); + Result := Result + InternalGetDirSize(APath + string(Buf)); libc_chdir(PChar(APath)); - end else Inc(Result, StatBuf^.st_size); + end else Result := Result + StatBuf^.st_size; end; libc_free(StatBuf); end; @@ -599,7 +599,7 @@ begin Break; // We cannot ignore write errors end; - Inc(BytesDone, BytesRead); + BytesDone := BytesDone + BytesRead; if (@ProgressFunc <> nil) and (not ProgressFunc(Sender, BytesDone, nil)) then Break; end; |