Skip to content

Commit 84d0288

Browse files
committed
Fix compiler warnings, bump rev.
1 parent 39df22c commit 84d0288

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

Source/DiskImageManager.lpi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<AutoIncrementBuild Value="True"/>
3131
<MajorVersionNr Value="2"/>
3232
<MinorVersionNr Value="8"/>
33-
<RevisionNr Value="1"/>
33+
<RevisionNr Value="2"/>
3434
<BuildNr Value="108"/>
3535
<StringTable CompanyName="Envy Technologies" InternalName="Disk Image Manager" LegalCopyright="Copyright 2002-2024 Damien Guard." OriginalFilename="DiskImageManager.exe" ProductName="Disk Image Manager"/>
3636
</VersionInfo>

Source/DiskImageManager.res

0 Bytes
Binary file not shown.

Source/DskImage.pas

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -497,6 +497,7 @@ function TDSKImage.FindText(From: TDSKSector; Text: string; CaseSensitive: boole
497497
var
498498
NextSector: TDSKSector;
499499
begin
500+
Result := nil;
500501
if From = nil then
501502
NextSector := Disk.Side[0].Track[0].Sector[0]
502503
else
@@ -532,6 +533,7 @@ function TDSKImage.LoadFileDSK(DiskFile: TStream): boolean;
532533
begin
533534
Result := False;
534535
FoundIncorrectTrackMarkers := False;
536+
NextTrackPosition := 0;
535537

536538
DiskFile.ReadBuffer(DSKInfoBlock, SizeOf(DSKInfoBlock));
537539

@@ -1353,6 +1355,7 @@ function TDSKTrack.GetFirstLogicalSector: TDSKSector;
13531355
var
13541356
Sector: TDSKSector;
13551357
begin
1358+
Result := nil;
13561359
if not IsFormatted then exit;
13571360

13581361
Result := self.Sector[0];

Source/filesystem.pas

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ procedure TDSKFileSystem.TryPlus3DOSHeader(Data: array of byte; DiskFile: TDSKFi
280280
Sig: string;
281281
CalcChecksum: byte;
282282
Idx: integer;
283-
Length, Param1, Param2: word;
283+
Param1: word;
284284
begin
285285
Sig := StrBlockClean(Data, 0, 8);
286286
if Sig <> 'PLUS3DOS' then exit;
@@ -294,9 +294,7 @@ procedure TDSKFileSystem.TryPlus3DOSHeader(Data: array of byte; DiskFile: TDSKFi
294294
DiskFile.Size := Data[11] + (Data[12] << 8) + (Data[13] << 16) + (Data[14] << 24);
295295
DiskFile.HeaderSize := 128;
296296

297-
Length := Data[16] + (Data[17] << 8);
298297
Param1 := Data[18] + (Data[19] << 8);
299-
Param2 := Data[20] + (Data[21] << 8);
300298

301299
case Data[15] of
302300
0: begin
@@ -307,7 +305,7 @@ procedure TDSKFileSystem.TryPlus3DOSHeader(Data: array of byte; DiskFile: TDSKFi
307305
end;
308306
1: DiskFile.Meta := Format('DATA %s(%d)', [char(Data[19] - 64), Data[129] + (Data[130] << 8)]);
309307
2: DiskFile.Meta := Format('DATA %s$(%d)', [char(Data[19] - 128), Data[129] + (Data[130] << 8)]);
310-
3: DiskFile.Meta := Format('CODE %d,%d', [Param1, Length]);
308+
3: DiskFile.Meta := Format('CODE %d,%d', [Param1, Data[16] + (Data[17] << 8)]);
311309
else
312310
DiskFile.Meta := Format('Custom 0x%x', [Data[15]]);
313311
end;

0 commit comments

Comments
 (0)