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

Corrected some variables preinitialization.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-18 18:36:02 +00:00
parent 66808fa498
commit 276c8e0e69
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DiscImageChef.Device.Report/ata_report.c
View File

@@ -328,7 +328,7 @@ void AtaReport(int fd, xmlTextWriterPtr xmlWriter)
xmlTextWriterWriteFormatElement(xmlWriter, BAD_CAST "UnformattedBPS", "%u", xmlTextWriterWriteFormatElement(xmlWriter, BAD_CAST "UnformattedBPS", "%u",
le16toh(identify->UnformattedBPS)); le16toh(identify->UnformattedBPS));
uint64_t blocks; uint64_t blocks = 0;
if(identify->Cylinders > 0 && identify->Heads > 0 && identify->SectorsPerTrack != 0) if(identify->Cylinders > 0 && identify->Heads > 0 && identify->SectorsPerTrack != 0)
{ {

10
DiscImageChef.Device.Report/mmc_report.c
View File

@@ -1208,11 +1208,11 @@ void MmcReport(int fd, xmlTextWriterPtr xmlWriter, unsigned char *cdromMode)
xmlTextWriterStartElement(xmlWriter, BAD_CAST "ModeSense6Data"); xmlTextWriterStartElement(xmlWriter, BAD_CAST "ModeSense6Data");
xmlTextWriterWriteBase64(xmlWriter, buffer, 0, *(buffer + 0) + 1); xmlTextWriterWriteBase64(xmlWriter, buffer, 0, *(buffer + 0) + 1);
xmlTextWriterEndElement(xmlWriter); xmlTextWriterEndElement(xmlWriter);
if(!decMode->decoded) if(decMode == NULL || !decMode->decoded)
decMode = DecodeMode6(buffer, 0x05); decMode = DecodeMode6(buffer, 0x05);
} }
if(decMode->decoded) if(decMode != NULL && decMode->decoded)
{ {
xmlTextWriterWriteFormatElement(xmlWriter, BAD_CAST "MediumType", "%d", decMode->Header.MediumType); xmlTextWriterWriteFormatElement(xmlWriter, BAD_CAST "MediumType", "%d", decMode->Header.MediumType);
if(decMode->Header.descriptorsLength > 0) if(decMode->Header.descriptorsLength > 0)
@@ -1305,7 +1305,7 @@ void MmcReport(int fd, xmlTextWriterPtr xmlWriter, unsigned char *cdromMode)
} }
// All BDs but BD-ROM // All BDs but BD-ROM
if(i >= 1 || i <= 4) if(i >= 1 && i <= 4)
{ {
printf("Querying BD DDS...\n"); printf("Querying BD DDS...\n");
xmlTextWriterWriteFormatElement(xmlWriter, BAD_CAST "CanReadDDS", "%s", xmlTextWriterWriteFormatElement(xmlWriter, BAD_CAST "CanReadDDS", "%s",
@@ -1376,7 +1376,7 @@ void MmcReport(int fd, xmlTextWriterPtr xmlWriter, unsigned char *cdromMode)
} }
// All BDs // All BDs
if(i >= 16 && i <= 5) if(i >= 5 && i <= 16)
{ {
printf("Querying BD Disc Information...\n"); printf("Querying BD Disc Information...\n");
xmlTextWriterWriteFormatElement(xmlWriter, BAD_CAST "CanReadDiscInformation", "%s", xmlTextWriterWriteFormatElement(xmlWriter, BAD_CAST "CanReadDiscInformation", "%s",
@@ -1758,8 +1758,6 @@ void MmcReport(int fd, xmlTextWriterPtr xmlWriter, unsigned char *cdromMode)
sense[13] == 0x00) sense[13] == 0x00)
xmlTextWriterWriteFormatElement(xmlWriter, BAD_CAST "SupportsReadLong16", "%s", "true"); xmlTextWriterWriteFormatElement(xmlWriter, BAD_CAST "SupportsReadLong16", "%s", "true");
int i;
if(supportsReadLong10 && blockSize == longBlockSize) if(supportsReadLong10 && blockSize == longBlockSize)
{ {
error = ReadLong10(fd, &buffer, &sense, FALSE, FALSE, 0, 37856); error = ReadLong10(fd, &buffer, &sense, FALSE, FALSE, 0, 37856);

4
DiscImageChef.Device.Report/ssc_report.c
View File

@@ -198,11 +198,11 @@ void SscReport(int fd, xmlTextWriterPtr xmlWriter)
xmlTextWriterStartElement(xmlWriter, BAD_CAST "ModeSense6Data"); xmlTextWriterStartElement(xmlWriter, BAD_CAST "ModeSense6Data");
xmlTextWriterWriteBase64(xmlWriter, buffer, 0, *(buffer + 0) + 1); xmlTextWriterWriteBase64(xmlWriter, buffer, 0, *(buffer + 0) + 1);
xmlTextWriterEndElement(xmlWriter); xmlTextWriterEndElement(xmlWriter);
if(!decMode->decoded) if(decMode == NULL || !decMode->decoded)
decMode = DecodeMode6(buffer, 0x01); decMode = DecodeMode6(buffer, 0x01);
} }
if(decMode->decoded) if(decMode != NULL && decMode->decoded)
{ {
xmlTextWriterWriteFormatElement(xmlWriter, BAD_CAST "MediumType", "%d", decMode->Header.MediumType); xmlTextWriterWriteFormatElement(xmlWriter, BAD_CAST "MediumType", "%d", decMode->Header.MediumType);
if(decMode->Header.descriptorsLength > 0) if(decMode->Header.descriptorsLength > 0)