Skip to content

Reduce warnings count #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexroldugin wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Reduce warnings count #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9c02eb
use platform-non-specific function: IncludeTrailingBackslash -> Inclu…
alexroldugin Jan 5, 2020
809ba54
suppress platform-specific consts warnings for faArchive, faSysFile, …
alexroldugin Jan 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions KaZip.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1477,7 +1477,9 @@ function TKAZipEntries.ParseLocalHeaders(MS: TStream): Boolean;
CDFile.FileCommentLength := 0;
CDFile.DiskNumberStart := 0;
CDFile.InternalFileAttributes := LocalFile.VersionNeededToExtract;
{$WARN SYMBOL_PLATFORM OFF}
CDFile.ExternalFileAttributes := faArchive;
{$WARN SYMBOL_PLATFORM ON}
CDFile.RelativeOffsetOfLocalHeader := Poz;
CDFile.FileName := LocalFile.FileName;
L := Length(CDFile.FileName);
Expand Down Expand Up @@ -2364,7 +2366,9 @@ function TKAZipEntries.AddStream(FileName: string; FileAttr: Word; FileDate: TDa

function TKAZipEntries.AddStream(FileName: string; Stream: TStream): TKAZipEntriesEntry;
begin
{$WARN SYMBOL_PLATFORM OFF}
Result := AddStream(FileName, faArchive, Now, Stream);
{$WARN SYMBOL_PLATFORM ON}
end;

function TKAZipEntries.AddFile(FileName, NewFileName: string): TKAZipEntriesEntry;
Expand Down Expand Up @@ -2627,6 +2631,7 @@ procedure TKAZipEntries.InternalExtractToFile(Item: TKAZipEntriesEntry; FileName
end;
if FParent.FApplyAttributes then
begin
{$WARN SYMBOL_PLATFORM OFF}
Attr := faArchive;
if Item.FCentralDirectoryFile.ExternalFileAttributes and faHidden > 0 then
Attr := Attr or faHidden;
Expand All @@ -2635,6 +2640,7 @@ procedure TKAZipEntries.InternalExtractToFile(Item: TKAZipEntriesEntry; FileName
if Item.FCentralDirectoryFile.ExternalFileAttributes and faReadOnly > 0 then
Attr := Attr or faReadOnly;
FileSetAttr(FileName, Attr);
{$WARN SYMBOL_PLATFORM ON}
end;
end;
end;
Expand Down Expand Up @@ -2836,7 +2842,7 @@ procedure TKAZipEntries.CreateFolder(FolderName: string; FolderDate: TDateTime);
var
FN: string;
begin
FN := IncludeTrailingBackslash(FolderName);
FN := IncludeTrailingPathDelimiter(FolderName);
AddFolderChain(FN, faDirectory, FolderDate);
FParent.FIsDirty := True;
end;
Expand All @@ -2849,8 +2855,8 @@ procedure TKAZipEntries.RenameFolder(FolderName: string; NewFolderName: string);
X: Integer;
L: Integer;
begin
FN := ToZipName(IncludeTrailingBackslash(FolderName));
NFN := ToZipName(IncludeTrailingBackslash(NewFolderName));
FN := ToZipName(IncludeTrailingPathDelimiter(FolderName));
NFN := ToZipName(IncludeTrailingPathDelimiter(NewFolderName));
L := Length(FN);
if IndexOf(NFN) = -1 then
begin
Expand Down Expand Up @@ -3740,7 +3746,9 @@ function TKAZip.AddEntryThroughStream(FileName: string): TStream;
stm.Free;
end;
}
{$WARN SYMBOL_PLATFORM OFF}
Result := Entries.AddEntryThroughStream(FileName, Now, faArchive);
{$WARN SYMBOL_PLATFORM ON}
end;

{ TCRC32Stream }
Expand Down