From bd4ac6d42e5fdfb0b58ca89b3c1688d7c32aec74 Mon Sep 17 00:00:00 2001
From: Andreas Kling <awesomekling@gmail.com>
Date: Sat, 22 Jun 2019 14:27:15 +0200
Subject: [PATCH] LibC: Fix various stdlib.cpp warnings.

---
 LibC/malloc.cpp |  4 ++--
 LibC/stdlib.cpp | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/LibC/malloc.cpp b/LibC/malloc.cpp
index ae3b6733e5..c089a3fd20 100644
--- a/LibC/malloc.cpp
+++ b/LibC/malloc.cpp
@@ -17,8 +17,8 @@
 #define MAGIC_BIGALLOC_HEADER 0x42697267
 #define PAGE_ROUND_UP(x) ((((size_t)(x)) + PAGE_SIZE - 1) & (~(PAGE_SIZE - 1)))
 
-static const size_t number_of_chunked_blocks_to_keep_around_per_size_class = 32;
-static const size_t number_of_big_blocks_to_keep_around_per_size_class = 8;
+static const int number_of_chunked_blocks_to_keep_around_per_size_class = 32;
+static const int number_of_big_blocks_to_keep_around_per_size_class = 8;
 
 static bool s_log_malloc = false;
 static bool s_scrub_malloc = true;
diff --git a/LibC/stdlib.cpp b/LibC/stdlib.cpp
index d9a6c70fc3..819ab424fd 100644
--- a/LibC/stdlib.cpp
+++ b/LibC/stdlib.cpp
@@ -44,16 +44,17 @@ int atexit(void (*handler)())
 void abort()
 {
     raise(SIGABRT);
+    ASSERT_NOT_REACHED();
 }
 
-static HashTable<char*> s_malloced_environment_variables;
+static HashTable<const char*> s_malloced_environment_variables;
 
 static void free_environment_variable_if_needed(const char* var)
 {
-    if (!s_malloced_environment_variables.contains((char*)var))
+    if (!s_malloced_environment_variables.contains(var))
         return;
-    free((void*)var);
-    s_malloced_environment_variables.remove((char*)var);
+    free(const_cast<char*>(var));
+    s_malloced_environment_variables.remove(var);
 }
 
 char* getenv(const char* name)
@@ -78,13 +79,13 @@ int unsetenv(const char* name)
 {
     auto new_var_len = strlen(name);
     size_t environ_size = 0;
-    size_t skip = -1;
+    int skip = -1;
 
     for (; environ[environ_size]; ++environ_size) {
         char* old_var = environ[environ_size];
         char* old_eq = strchr(old_var, '=');
         ASSERT(old_eq);
-        auto old_var_len = old_eq - old_var;
+        size_t old_var_len = old_eq - old_var;
 
         if (new_var_len != old_var_len)
             continue; // can't match
@@ -123,7 +124,7 @@ int putenv(char* new_var)
         return unsetenv(new_var);
 
     auto new_var_len = new_eq - new_var;
-    size_t environ_size = 0;
+    int environ_size = 0;
     for (; environ[environ_size]; ++environ_size) {
         char* old_var = environ[environ_size];
         char* old_eq = strchr(old_var, '=');
@@ -148,7 +149,7 @@ int putenv(char* new_var)
         return -1;
     }
 
-    for (size_t i = 0; environ[i]; ++i) {
+    for (int i = 0; environ[i]; ++i) {
         new_environ[i] = environ[i];
     }