From 623294dd35201b669d88301e2f8fc065f28e14ed Mon Sep 17 00:00:00 2001
From: Baptiste Wicht <baptiste.wicht@gmail.com>
Date: Thu, 25 Aug 2016 22:49:43 +0200
Subject: [PATCH] Some cleanup

---
 kernel/src/fs/fat32.cpp     |  8 ++------
 kernel/src/system_calls.cpp |  4 +---
 kernel/src/terminal.cpp     | 10 ++++------
 kernel/src/vfs/vfs.cpp      |  6 ++----
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/kernel/src/fs/fat32.cpp b/kernel/src/fs/fat32.cpp
index c6c517cb..ca839cd9 100644
--- a/kernel/src/fs/fat32.cpp
+++ b/kernel/src/fs/fat32.cpp
@@ -955,9 +955,7 @@ fat32::cluster_entry* fat32::fat32_file_system::find_free_entry(std::unique_heap
         //remove the end of directory markers
         if(end_found){
             //Remove all the end of directory marker in the cluster
-            for(size_t i = 0; i < directory_cluster.size(); ++i){
-                auto& entry = directory_cluster[i];
-
+            for(auto& entry : directory_cluster){
                 if(end_of_directory(entry)){
                     entry.name[0] = 0xE5;
                 }
@@ -1018,9 +1016,7 @@ fat32::cluster_entry* fat32::fat32_file_system::extend_directory(std::unique_hea
     }
 
     //Remove all the end of directory marker in the previous cluster
-    for(size_t i = 0; i < directory_cluster.size(); ++i){
-        auto& entry = directory_cluster[i];
-
+    for(auto& entry : directory_cluster){
         if(end_of_directory(entry)){
             entry.name[0] = 0xE5;
         }
diff --git a/kernel/src/system_calls.cpp b/kernel/src/system_calls.cpp
index f04a5803..b5d9536d 100644
--- a/kernel/src/system_calls.cpp
+++ b/kernel/src/system_calls.cpp
@@ -243,9 +243,7 @@ void sc_pwd(interrupt::syscall_regs* regs){
     auto p = wd.string();
 
     auto buffer = reinterpret_cast<char*>(regs->rbx);
-    for(size_t i = 0; i < p.size(); ++i){
-        buffer[i] = p[i];
-    }
+    std::copy(p.begin(), p.end(), buffer);
     buffer[p.size()] = '\0';
 }
 
diff --git a/kernel/src/terminal.cpp b/kernel/src/terminal.cpp
index 3c3e5c92..fc86fa75 100644
--- a/kernel/src/terminal.cpp
+++ b/kernel/src/terminal.cpp
@@ -214,10 +214,10 @@ void stdio::virtual_terminal::set_mouse(bool m){
 }
 
 void stdio::init_terminals(){
-    for(size_t i  = 0; i < MAX_TERMINALS; ++i){
-        auto& terminal = terminals[i];
+    size_t id = 0;
 
-        terminal.id = i;
+    for(auto& terminal : terminals){
+        terminal.id = i++;
         terminal.active = false;
         terminal.canonical = true;
         terminal.mouse = false;
@@ -228,9 +228,7 @@ void stdio::init_terminals(){
 }
 
 void stdio::finalize(){
-    for(size_t i  = 0; i < MAX_TERMINALS; ++i){
-        auto& terminal = terminals[i];
-
+    for(auto& terminal : terminals){
         auto* user_stack = new char[scheduler::user_stack_size];
         auto* kernel_stack = new char[scheduler::kernel_stack_size];
 
diff --git a/kernel/src/vfs/vfs.cpp b/kernel/src/vfs/vfs.cpp
index 66dda15d..e2f962cf 100644
--- a/kernel/src/vfs/vfs.cpp
+++ b/kernel/src/vfs/vfs.cpp
@@ -122,7 +122,7 @@ mounted_fs& get_fs(const path& base_path){
         }
     }
 
-    return mount_point_list[best_match];;
+    return mount_point_list[best_match];
 }
 
 path get_fs_path(const path& base_path, const mounted_fs& fs){
@@ -547,9 +547,7 @@ int64_t vfs::entries(size_t fd, char* buffer, size_t size){
         }
 
         char* name_buffer = &(entry->name);
-        for(size_t j = 0; j < file.file_name.size(); ++j){
-            name_buffer[j] = file.file_name[j];
-        }
+        std::copy(file.file_name.begin(), file.file_name.end(), name_buffer);
         name_buffer[file.file_name.size()] = '\0';
     }