Correct calculation of totalBlocks() in SD.h and SDFS.h (earlephilhower#1899)

erpebe · web-flow · commit c4f36170d485 · 2023-12-13T12:45:15.000-08:00
diff --git a/libraries/SD/src/SD.h b/libraries/SD/src/SD.h
@@ -128,7 +128,7 @@ class SDClass {
     }
 
     size_t totalBlocks() {
-        return (totalClusters() / blocksPerCluster());
+        return (totalClusters() * blocksPerCluster());
     }
 
     size_t clusterSize() {
diff --git a/libraries/SDFS/src/SDFS.h b/libraries/SDFS/src/SDFS.h
@@ -183,7 +183,7 @@ class SDFSImpl : public FSImpl {
         return _fs.vol()->clusterCount();
     }
     size_t totalBlocks() {
-        return (totalClusters() / blocksPerCluster());
+        return (totalClusters() * blocksPerCluster());
     }
     size_t clusterSize() {
         return _fs.vol()->bytesPerCluster();

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ class SDClass {`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`size_t totalBlocks() {`
`131`		`- return (totalClusters() / blocksPerCluster());`
	`131`	`+ return (totalClusters() * blocksPerCluster());`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`size_t clusterSize() {`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ class SDFSImpl : public FSImpl {`
`183`	`183`	`return _fs.vol()->clusterCount();`
`184`	`184`	`}`
`185`	`185`	`size_t totalBlocks() {`
`186`		`- return (totalClusters() / blocksPerCluster());`
	`186`	`+ return (totalClusters() * blocksPerCluster());`
`187`	`187`	`}`
`188`	`188`	`size_t clusterSize() {`
`189`	`189`	`return _fs.vol()->bytesPerCluster();`