[openMSX-commits] SF.net SVN: openmsx: [6524] openmsx/trunk/src/fdc/MSXtar.cc

[<m97...@us...>]

Revision: 6524
          http://svn.sourceforge.net/openmsx/?rev=6524&view=rev
Author:   m9710797
Date:     2007-05-26 09:17:19 -0700 (Sat, 26 May 2007)

Log Message:
-----------
fixed uninitialized variables

Modified Paths:
--------------
    openmsx/trunk/src/fdc/MSXtar.cc

Modified: openmsx/trunk/src/fdc/MSXtar.cc
===================================================================
--- openmsx/trunk/src/fdc/MSXtar.cc	2007-05-26 12:44:01 UTC (rev 6523)
+++ openmsx/trunk/src/fdc/MSXtar.cc	2007-05-26 16:17:19 UTC (rev 6524)
@@ -827,12 +827,13 @@
 	unsigned d = rdsh(direntry.date);
 	struct tm mtim;
 	struct utimbuf utim;
-	mtim.tm_sec  =  (t & 0x001f) << 1;
-	mtim.tm_min  =  (t & 0x03e0) >> 5;
-	mtim.tm_hour =  (t & 0xf800) >> 11;
-	mtim.tm_mday =  (d & 0x001f);
-	mtim.tm_mon  =  (d & 0x01e0) >> 5;
-	mtim.tm_year = ((d & 0xfe00) >> 9) + 80;
+	mtim.tm_sec   =  (t & 0x001f) << 1;
+	mtim.tm_min   =  (t & 0x03e0) >> 5;
+	mtim.tm_hour  =  (t & 0xf800) >> 11;
+	mtim.tm_mday  =  (d & 0x001f);
+	mtim.tm_mon   =  (d & 0x01e0) >> 5;
+	mtim.tm_year  = ((d & 0xfe00) >> 9) + 80;
+	mtim.tm_isdst = -1;
 	utim.actime  = mktime(&mtim);
 	utim.modtime = mktime(&mtim);
 	utime(resultFile.c_str(), &utim);
@@ -986,16 +987,14 @@
 bool MSXtar::hasPartitionTable()
 {
 	byte buf[SECTOR_SIZE];
-	assert(partitionOffset == 0);
-	readLogicalSector(0, buf);
+	disk.readLogicalSector(0, buf);
 	return isPartitionTableSector(buf);
 }
 
 bool MSXtar::hasPartition(unsigned partition)
 {
 	byte buf[SECTOR_SIZE];
-	assert(partitionOffset == 0);
-	readLogicalSector(0, buf);
+	disk.readLogicalSector(0, buf);
 	if (!isPartitionTableSector(buf)) {
 		return false;
 	}
@@ -1013,7 +1012,7 @@
 	byte partitionTable[SECTOR_SIZE];
 	partitionOffset = 0;
 	partitionNbSectors = disk.getNbSectors();
-	readLogicalSector(0, partitionTable);
+	disk.readLogicalSector(0, partitionTable);
 	bool hasPartitionTable = isPartitionTableSector(partitionTable);
 	if (hasPartitionTable) {
 		Partition* p = (Partition*)
@@ -1030,7 +1029,7 @@
 	}
 
 	byte bootSector[SECTOR_SIZE];
-	readLogicalSector(0, bootSector);
+	disk.readLogicalSector(partitionOffset, bootSector);
 	parseBootSectorFAT(bootSector);
 	return hasPartitionTable;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.