TheCloud/thor-os
1
0
Fork 0
mirror of https://github.com/wichtounet/thor-os.git synced 2025-09-12 14:10:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename variable to avoid collision

Browse Source
This commit is contained in:
Baptiste Wicht 2016-07-03 13:21:01 +02:00
parent b08ca6458f
commit f47f6d30e7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/src/fs/fat32.cpp
View File

@ -252,9 +252,9 @@ size_t fat32::fat32_file_system::read(const std::vector<std::string>& file_path,
auto cluster_last = (cluster + 1) * cluster_size; auto cluster_last = (cluster + 1) * cluster_size;
if(first < cluster_last){ if(first < cluster_last){
std::unique_heap_array<char> cluster(cluster_size); std::unique_heap_array<char> cluster_buffer(cluster_size);
if(read_sectors(cluster_lba(cluster_number), fat_bs->sectors_per_cluster, cluster.get())){ if(read_sectors(cluster_lba(cluster_number), fat_bs->sectors_per_cluster, cluster_buffer.get())){
size_t i = 0; size_t i = 0;
if(position == 0){ if(position == 0){
@ -262,7 +262,7 @@ size_t fat32::fat32_file_system::read(const std::vector<std::string>& file_path,
} }
for(; i < cluster_size && read_bytes < last; ++i, ++read_bytes){ for(; i < cluster_size && read_bytes < last; ++i, ++read_bytes){
buffer[position++] = cluster[i]; buffer[position++] = cluster_buffer[i];
} }
} else { } else {
return std::ERROR_FAILED; return std::ERROR_FAILED;