From f465da4c0b2054a98d6e4e098f5b5b433737f43d Mon Sep 17 00:00:00 2001
From: Madhura Jayaraman <madjay@google.com>
Date: Fri, 14 Jun 2024 11:13:36 -0700
Subject: [PATCH] Addressign comments

Change-Id: I2530e3c539d817786ef456bb0387552bce65454e
---
 starboard/android/shared/posix_emu/dirent.cc |  4 ++--
 starboard/shared/win32/posix_emu/dirent.cc   | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/starboard/android/shared/posix_emu/dirent.cc b/starboard/android/shared/posix_emu/dirent.cc
index beae563c72b0..d3f92f1951e9 100644
--- a/starboard/android/shared/posix_emu/dirent.cc
+++ b/starboard/android/shared/posix_emu/dirent.cc
@@ -57,7 +57,7 @@ static int gen_fd() {
 Mutex mutex_;
 static std::map<int, AAssetDir*>* asset_map = nullptr;
 
-int handle_db_put(AAssetDir* assetDir) {
+static int handle_db_put(AAssetDir* assetDir) {
   ScopedLock scoped_lock(mutex_);
   if (asset_map == nullptr) {
     asset_map = new std::map<int, AAssetDir*>();
@@ -90,7 +90,7 @@ static AAssetDir* handle_db_get(int fd, bool erase) {
 
   AAssetDir* asset_dir = itr->second;
   if (erase) {
-    asset_map->erase(fd);
+    asset_map->erase(itr);
   }
   return asset_dir;
 }
diff --git a/starboard/shared/win32/posix_emu/dirent.cc b/starboard/shared/win32/posix_emu/dirent.cc
index 6c356abcaefe..227b367a8dad 100644
--- a/starboard/shared/win32/posix_emu/dirent.cc
+++ b/starboard/shared/win32/posix_emu/dirent.cc
@@ -42,7 +42,7 @@ static int gen_fd() {
 static std::map<int, std::deque<std::string>>* directory_map = nullptr;
 static CriticalSection g_critical_section;
 
-int handle_db_put(std::deque<std::string> next_directory_entry) {
+static int handle_db_put(std::deque<std::string> next_directory_entry) {
   EnterCriticalSection(&g_critical_section.critical_section_);
   if (directory_map == nullptr) {
     directory_map = new std::map<int, std::deque<std::string>>();
@@ -68,24 +68,26 @@ static std::deque<std::string> handle_db_get(int handle, bool erase) {
   }
   EnterCriticalSection(&g_critical_section.critical_section_);
   if (directory_map == nullptr) {
-    directory_map = new std::map<int, std::deque<std::string>>();
+    LeaveCriticalSection(&g_critical_section.critical_section_);
     return empty_deque;
   }
 
   auto itr = directory_map->find(handle);
   if (itr == directory_map->end()) {
+    LeaveCriticalSection(&g_critical_section.critical_section_);
     return empty_deque;
   }
 
   std::deque<std::string> next_directory_entry = itr->second;
   if (erase) {
-    directory_map->erase(handle);
+    directory_map->erase(itr);
   }
   LeaveCriticalSection(&g_critical_section.critical_section_);
   return next_directory_entry;
 }
 
-void handle_db_replace(int fd, std::deque<std::string> next_directory_entry) {
+static void handle_db_replace(int fd,
+                              std::deque<std::string> next_directory_entry) {
   EnterCriticalSection(&g_critical_section.critical_section_);
   if (directory_map == nullptr) {
     directory_map = new std::map<int, std::deque<std::string>>();