aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

REFACTOR: Removed unneeded value sets.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-21 16:07:20 +00:00
parent 9883b567ff
commit bcbda18e4d
110 changed files with 203 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
DiscImageChef.DiscImages/Alcohol120.cs
View File

@@ -206,7 +206,7 @@ namespace DiscImageChef.DiscImages
byte[] hdr = new byte[88];
stream.Read(hdr, 0, 88);
AlcoholHeader header = new AlcoholHeader();
AlcoholHeader header;
IntPtr hdrPtr = Marshal.AllocHGlobal(88);
Marshal.Copy(hdr, 0, hdrPtr, 88);
header = (AlcoholHeader)Marshal.PtrToStructure(hdrPtr, typeof(AlcoholHeader));
@@ -224,7 +224,7 @@ namespace DiscImageChef.DiscImages
isDvd = false;
byte[] hdr = new byte[88];
stream.Read(hdr, 0, 88);
AlcoholHeader header = new AlcoholHeader();
AlcoholHeader header;
IntPtr hdrPtr = Marshal.AllocHGlobal(88);
Marshal.Copy(hdr, 0, hdrPtr, 88);
header = (AlcoholHeader)Marshal.PtrToStructure(hdrPtr, typeof(AlcoholHeader));
@@ -263,7 +263,7 @@ namespace DiscImageChef.DiscImages
{
byte[] sesHdr = new byte[24];
stream.Read(sesHdr, 0, 24);
AlcoholSession session = new AlcoholSession();
AlcoholSession session;
IntPtr sesPtr = Marshal.AllocHGlobal(24);
Marshal.Copy(sesHdr, 0, sesPtr, 24);
session = (AlcoholSession)Marshal.PtrToStructure(sesPtr, typeof(AlcoholSession));
@@ -304,7 +304,6 @@ namespace DiscImageChef.DiscImages
trkHdr = new byte[80];
stream.Read(trkHdr, 0, 80);
track = new AlcoholTrack();
trkPtr = Marshal.AllocHGlobal(80);
Marshal.Copy(trkHdr, 0, trkPtr, 80);
track = (AlcoholTrack)Marshal.PtrToStructure(trkPtr, typeof(AlcoholTrack));
@@ -370,7 +369,7 @@ namespace DiscImageChef.DiscImages
byte[] extHdr = new byte[8];
stream.Seek(track.extraOffset, SeekOrigin.Begin);
stream.Read(extHdr, 0, 8);
AlcoholTrackExtra extra = new AlcoholTrackExtra();
AlcoholTrackExtra extra;
IntPtr extPtr = Marshal.AllocHGlobal(8);
Marshal.Copy(extHdr, 0, extPtr, 8);
extra = (AlcoholTrackExtra)Marshal.PtrToStructure(extPtr, typeof(AlcoholTrackExtra));
@@ -1348,7 +1347,7 @@ namespace DiscImageChef.DiscImages
default: throw new FeatureSupportedButNotImplementedImageException("Unsupported track type");
}
byte[] buffer = new byte[sector_size * length];
byte[] buffer;
imageStream = alcImage.GetDataForkStream();
BinaryReader br = new BinaryReader(imageStream);

6
DiscImageChef.DiscImages/Apridisk.cs
View File

@@ -148,7 +148,7 @@ namespace DiscImageChef.DiscImages
// Count cylinders
while(stream.Position < stream.Length)
{
ApridiskRecord record = new ApridiskRecord();
ApridiskRecord record;
byte[] rec_b = new byte[recordSize];
stream.Read(rec_b, 0, recordSize);
@@ -241,7 +241,7 @@ namespace DiscImageChef.DiscImages
stream.Seek(signature.Length, SeekOrigin.Begin);
while(stream.Position < stream.Length)
{
ApridiskRecord record = new ApridiskRecord();
ApridiskRecord record;
byte[] rec_b = new byte[recordSize];
stream.Read(rec_b, 0, recordSize);
@@ -322,7 +322,7 @@ namespace DiscImageChef.DiscImages
{
int readp = 0;
ushort blklen;
uint u_len = 0;
uint u_len;
int c_len = compressed.Length;
MemoryStream buffer = new MemoryStream();

2
DiscImageChef.DiscImages/BlindWrite4.cs
View File

@@ -1245,7 +1245,7 @@ namespace DiscImageChef.DiscImages
default: throw new FeatureSupportedButNotImplementedImageException("Unsupported track type");
}
byte[] buffer = new byte[sectorSize * length];
byte[] buffer;
imageStream = _track.TrackFilter.GetDataForkStream();
BinaryReader br = new BinaryReader(imageStream);

5
DiscImageChef.DiscImages/CDRDAO.cs
View File

@@ -407,7 +407,7 @@ namespace DiscImageChef.DiscImages
}
tocStream = new StreamReader(this.imageFilter.GetDataForkStream());
FiltersList filtersList = new FiltersList();
FiltersList filtersList;
line = 0;
tocStream.BaseStream.Position = 0;
@@ -416,7 +416,7 @@ namespace DiscImageChef.DiscImages
line++;
_line = tocStream.ReadLine();
matchComment = regexComment.Match(_line ?? throw new ());
matchComment = regexComment.Match(_line ?? throw new InvalidOperationException());
matchDiskType = regexDiskType.Match(_line);
matchMcn = regexMcn.Match(_line);
matchTrack = regexTrack.Match(_line);
@@ -889,7 +889,6 @@ namespace DiscImageChef.DiscImages
}
partitions.Add(partition);
partition = new Partition();
}
// Print partition map

3
DiscImageChef.DiscImages/CDRWin.cs
View File

@@ -331,11 +331,9 @@ namespace DiscImageChef.DiscImages
}
cueStream = new StreamReader(this.imageFilter.GetDataForkStream());
int line = 0;
while(cueStream.Peek() >= 0)
{
line++;
string _line = cueStream.ReadLine();
Regex sr = new Regex(SESSION_REGEX);
@@ -1179,7 +1177,6 @@ namespace DiscImageChef.DiscImages
}
partitions.Add(partition);
partition = new Partition();
}
// Print offset map

14
DiscImageChef.DiscImages/CHD.cs
View File

@@ -616,7 +616,7 @@ namespace DiscImageChef.DiscImages
{
Stream stream = imageFilter.GetDataForkStream();
stream.Seek(0, SeekOrigin.Begin);
byte[] buffer = new byte[8];
byte[] buffer;
byte[] magic = new byte[8];
stream.Read(magic, 0, 8);
if(!chdTag.SequenceEqual(magic)) return false;
@@ -665,7 +665,7 @@ namespace DiscImageChef.DiscImages
uint hunkSectorCount = (uint)Math.Ceiling((double)hdrV1.totalhunks * 8 / 512);
byte[] hunkSectorBytes = new byte[512];
HunkSector hunkSector = new HunkSector();
HunkSector hunkSector;
for(int i = 0; i < hunkSectorCount; i++)
{
@@ -738,7 +738,7 @@ namespace DiscImageChef.DiscImages
uint hunkSectorCount = (uint)Math.Ceiling((double)hdrV2.totalhunks * 8 / 512);
byte[] hunkSectorBytes = new byte[512];
HunkSector hunkSector = new HunkSector();
HunkSector hunkSector;
for(int i = 0; i < hunkSectorCount; i++)
{
@@ -915,7 +915,7 @@ namespace DiscImageChef.DiscImages
uint hunkSectorCount = (uint)Math.Ceiling((double)hunkTableSmall.Length * 4 / 512);
byte[] hunkSectorBytes = new byte[512];
HunkSectorSmall hunkSector = new HunkSectorSmall();
HunkSectorSmall hunkSector;
stream.Seek((long)hdrV5.mapoffset, SeekOrigin.Begin);
@@ -1640,7 +1640,7 @@ namespace DiscImageChef.DiscImages
ulong GetAbsoluteSector(ulong relativeSector, uint track)
{
Track _track = new Track();
Track _track;
tracks.TryGetValue(track, out _track);
return _track.TrackStartSector + relativeSector;
}
@@ -1678,7 +1678,6 @@ namespace DiscImageChef.DiscImages
read, sectorsPerHunk * ImageInfo.SectorSize));
zStream.Close();
zStream = null;
}
break;
@@ -1711,7 +1710,6 @@ namespace DiscImageChef.DiscImages
read, bytesPerHunk));
zStream.Close();
zStream = null;
}
// TODO: Guess wth is MAME doing with these hunks
else
@@ -1734,7 +1732,7 @@ namespace DiscImageChef.DiscImages
break;
case Chdv3EntryFlags.Mini:
hunk = new byte[bytesPerHunk];
byte[] mini = new byte[8];
byte[] mini;
mini = BigEndianBitConverter.GetBytes(entry.offset);
for(int i = 0; i < bytesPerHunk; i++) hunk[i] = mini[i % 8];

6
DiscImageChef.DiscImages/CPCDSK.cs
View File

@@ -239,7 +239,7 @@ namespace DiscImageChef.DiscImages
byte[] headerB = new byte[256];
stream.Read(headerB, 0, 256);
CpcDiskInfo header = new CpcDiskInfo();
CpcDiskInfo header;
IntPtr headerPtr = Marshal.AllocHGlobal(256);
Marshal.Copy(headerB, 0, headerPtr, 256);
header = (CpcDiskInfo)Marshal.PtrToStructure(headerPtr, typeof(CpcDiskInfo));
@@ -261,7 +261,7 @@ namespace DiscImageChef.DiscImages
byte[] headerB = new byte[256];
stream.Read(headerB, 0, 256);
CpcDiskInfo header = new CpcDiskInfo();
CpcDiskInfo header;
IntPtr headerPtr = Marshal.AllocHGlobal(256);
Marshal.Copy(headerB, 0, headerPtr, 256);
header = (CpcDiskInfo)Marshal.PtrToStructure(headerPtr, typeof(CpcDiskInfo));
@@ -309,7 +309,7 @@ namespace DiscImageChef.DiscImages
byte[] trackB = new byte[256];
stream.Read(trackB, 0, 256);
CpcTrackInfo trackInfo = new CpcTrackInfo();
CpcTrackInfo trackInfo;
IntPtr trackPtr = Marshal.AllocHGlobal(256);
Marshal.Copy(trackB, 0, trackPtr, 256);
trackInfo = (CpcTrackInfo)Marshal.PtrToStructure(trackPtr, typeof(CpcTrackInfo));

4
DiscImageChef.DiscImages/CisCopy.cs
View File

@@ -121,7 +121,7 @@ namespace DiscImageChef.DiscImages
stream.Seek(0, SeekOrigin.Begin);
DiskType type = (DiskType)stream.ReadByte();
byte tracks = 0;
byte tracks;
switch(type)
{
@@ -192,7 +192,7 @@ namespace DiscImageChef.DiscImages
MemoryStream decodedImage;
DiskType type = (DiskType)stream.ReadByte();
byte tracks = 0;
byte tracks;
switch(type)
{

1
DiscImageChef.DiscImages/DiscJuggler.cs
View File

@@ -174,7 +174,6 @@ namespace DiscImageChef.DiscImages
// Read track
for(byte t = 0; t < maxT; t++)
{
addedATrack = false;
DicConsole.DebugWriteLine("DiscJuggler plugin", "t = {0}", t);
Track track = new Track();

2
DiscImageChef.DiscImages/DriDiskCopy.cs
View File

@@ -166,7 +166,7 @@ namespace DiscImageChef.DiscImages
stream.Seek(-buffer.Length, SeekOrigin.End);
stream.Read(buffer, 0, buffer.Length);
DriFooter tmpFooter = new DriFooter();
DriFooter tmpFooter;
IntPtr ftrPtr = Marshal.AllocHGlobal(buffer.Length);
Marshal.Copy(buffer, 0, ftrPtr, buffer.Length);
tmpFooter = (DriFooter)Marshal.PtrToStructure(ftrPtr, typeof(DriFooter));

1
DiscImageChef.DiscImages/KryoFlux.cs
View File

@@ -233,7 +233,6 @@ namespace DiscImageChef.DiscImages
else
{
DicConsole.DebugWriteLine("KryoFlux plugin", "Arrived end of disk at cylinder {0}", cylinder);
step = 2;
break;
}

4
DiscImageChef.DiscImages/MaxiDisk.cs
View File

@@ -113,7 +113,7 @@ namespace DiscImageChef.DiscImages
stream.Seek(0, SeekOrigin.Begin);
stream.Read(buffer, 0, buffer.Length);
HdkHeader tmp_header = new HdkHeader();
HdkHeader tmp_header;
IntPtr ftrPtr = Marshal.AllocHGlobal(buffer.Length);
Marshal.Copy(buffer, 0, ftrPtr, buffer.Length);
tmp_header = (HdkHeader)Marshal.PtrToStructure(ftrPtr, typeof(HdkHeader));
@@ -159,7 +159,7 @@ namespace DiscImageChef.DiscImages
stream.Seek(0, SeekOrigin.Begin);
stream.Read(buffer, 0, buffer.Length);
HdkHeader tmp_header = new HdkHeader();
HdkHeader tmp_header;
IntPtr ftrPtr = Marshal.AllocHGlobal(buffer.Length);
Marshal.Copy(buffer, 0, ftrPtr, buffer.Length);
tmp_header = (HdkHeader)Marshal.PtrToStructure(ftrPtr, typeof(HdkHeader));

1
DiscImageChef.DiscImages/NDIF.cs
View File

@@ -515,7 +515,6 @@ namespace DiscImageChef.DiscImages
int realSize = decStream.Read(tmpBuffer, 0, (int)buffersize);
buffer = new byte[realSize];
Array.Copy(tmpBuffer, 0, buffer, 0, realSize);
tmpBuffer = null;
if(currentChunkCacheSize + realSize > MAX_CACHE_SIZE)
{

4
DiscImageChef.DiscImages/QCOW.cs
View File

@@ -349,8 +349,8 @@ namespace DiscImageChef.DiscImages
{
if((offset & QCOW_COMPRESSED) == QCOW_COMPRESSED)
{
ulong compSizeMask = 0;
ulong offMask = 0;
ulong compSizeMask;
ulong offMask;
compSizeMask = (ulong)(1 << qHdr.cluster_bits) - 1;
compSizeMask <<= 63 - qHdr.cluster_bits;

4
DiscImageChef.DiscImages/QCOW2.cs
View File

@@ -396,8 +396,8 @@ namespace DiscImageChef.DiscImages
{
if((offset & QCOW_COMPRESSED) == QCOW_COMPRESSED)
{
ulong compSizeMask = 0;
ulong offMask = 0;
ulong compSizeMask;
ulong offMask;
compSizeMask = (ulong)(1 << (int)(qHdr.cluster_bits - 8)) - 1;
byte countbits = (byte)(qHdr.cluster_bits - 8);

4
DiscImageChef.DiscImages/RayDIM.cs
View File

@@ -107,7 +107,7 @@ namespace DiscImageChef.DiscImages
stream.Seek(0, SeekOrigin.Begin);
stream.Read(buffer, 0, buffer.Length);
RayHdr header = new RayHdr();
RayHdr header;
IntPtr ftrPtr = Marshal.AllocHGlobal(buffer.Length);
Marshal.Copy(buffer, 0, ftrPtr, buffer.Length);
header = (RayHdr)Marshal.PtrToStructure(ftrPtr, typeof(RayHdr));
@@ -141,7 +141,7 @@ namespace DiscImageChef.DiscImages
stream.Seek(0, SeekOrigin.Begin);
stream.Read(buffer, 0, buffer.Length);
RayHdr header = new RayHdr();
RayHdr header;
IntPtr ftrPtr = Marshal.AllocHGlobal(buffer.Length);
Marshal.Copy(buffer, 0, ftrPtr, buffer.Length);
header = (RayHdr)Marshal.PtrToStructure(ftrPtr, typeof(RayHdr));

2
DiscImageChef.DiscImages/SaveDskF.cs
View File

@@ -198,7 +198,7 @@ namespace DiscImageChef.DiscImages
calculatedChk = 0;
stream.Seek(0, SeekOrigin.Begin);
int b = 0;
int b;
do
{
b = stream.ReadByte();

3
DiscImageChef.DiscImages/TeleDisk.cs
View File

@@ -354,7 +354,7 @@ namespace DiscImageChef.DiscImages
if(header.Signature == TD_ADV_COMP_MAGIC)
{
int rd;
byte[] obuf = new byte[BUFSZ];
byte[] obuf;
inStream.Seek(12, SeekOrigin.Begin);
stream.Seek(12, SeekOrigin.Begin);
init_Decode();
@@ -369,7 +369,6 @@ namespace DiscImageChef.DiscImages
inStream.Read(copybuf, 0, copybuf.Length);
stream.Seek(0, SeekOrigin.Begin);
stream.Write(copybuf, 0, copybuf.Length);
copybuf = null;
}
stream.Seek(12, SeekOrigin.Begin);

1
DiscImageChef.DiscImages/UDIF.cs
View File

@@ -567,7 +567,6 @@ namespace DiscImageChef.DiscImages
int realSize = decStream.Read(tmpBuffer, 0, (int)buffersize);
buffer = new byte[realSize];
Array.Copy(tmpBuffer, 0, buffer, 0, realSize);
tmpBuffer = null;
if(currentChunkCacheSize + realSize > MAX_CACHE_SIZE)
{

2
DiscImageChef.DiscImages/VHD.cs
View File

@@ -787,7 +787,7 @@ namespace DiscImageChef.DiscImages
uint batSectorCount = (uint)Math.Ceiling((double)thisDynamic.MaxTableEntries * 4 / 512);
byte[] batSectorBytes = new byte[512];
BatSector batSector = new BatSector();
BatSector batSector;
// Unsafe and fast code. It takes 4 ms to fill a 30720 entries BAT
for(int i = 0; i < batSectorCount; i++)

1
DiscImageChef.DiscImages/VHDX.cs
View File

@@ -847,7 +847,6 @@ namespace DiscImageChef.DiscImages
}
bool partialBlock;
partialBlock = !((blkFlags & BAT_FLAGS_MASK) == PAYLOAD_BLOCK_FULLY_PRESENT);
partialBlock = (blkFlags & BAT_FLAGS_MASK) == PAYLOAD_BLOCK_PARTIALLY_PRESENT;
if(partialBlock && hasParent && !CheckBitmap(sectorAddress)) return parentImage.ReadSector(sectorAddress);

2
DiscImageChef.DiscImages/VMware.cs
View File

@@ -775,7 +775,7 @@ namespace DiscImageChef.DiscImages
return sector;
}
byte[] grain = new byte[SECTOR_SIZE * grainSize];
byte[] grain;
if(!grainCache.TryGetValue(grainOff, out grain))
{