From 8d54e928cd913380d6954074a9ad71ce32e6afa9 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 18 Nov 2019 17:11:16 -0800
Subject: [PATCH] [clang-tidy] C to C++ headers

Found with modernize-deprecated-headers

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 src/builtin.cpp             |  4 ++--
 src/builtin_argparse.cpp    |  7 +++----
 src/builtin_bg.cpp          |  5 ++---
 src/builtin_bind.cpp        |  5 ++---
 src/builtin_block.cpp       |  2 +-
 src/builtin_builtin.cpp     |  3 +--
 src/builtin_cd.cpp          |  3 ++-
 src/builtin_commandline.cpp |  9 ++++-----
 src/builtin_complete.cpp    |  3 +--
 src/builtin_disown.cpp      |  5 ++---
 src/builtin_echo.cpp        |  4 ++--
 src/builtin_eval.cpp        |  4 ++--
 src/builtin_exit.cpp        |  4 ++--
 src/builtin_fg.cpp          |  7 +++----
 src/builtin_function.cpp    |  6 +++---
 src/builtin_functions.cpp   |  2 +-
 src/builtin_history.cpp     |  7 +++----
 src/builtin_jobs.cpp        |  5 +++--
 src/builtin_math.cpp        |  5 ++---
 src/builtin_printf.cpp      | 16 ++++++++--------
 src/builtin_random.cpp      |  5 ++---
 src/builtin_read.cpp        | 10 +++++-----
 src/builtin_realpath.cpp    |  5 ++---
 src/builtin_return.cpp      |  4 ++--
 src/builtin_set.cpp         |  6 +++---
 src/builtin_set_color.cpp   |  4 ++--
 src/builtin_status.cpp      |  3 +--
 src/builtin_string.cpp      | 14 ++++++--------
 src/builtin_test.cpp        |  6 +++---
 src/builtin_ulimit.cpp      |  5 +++--
 src/color.cpp               |  7 +++----
 src/fish_test_helper.cpp    |  9 +++++----
 32 files changed, 86 insertions(+), 98 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index 8df9d1518..eb65c84ab 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -19,11 +19,11 @@
 
 #include "builtin.h"
 
-#include <errno.h>
-#include <stdlib.h>
 #include <unistd.h>
 
 #include <algorithm>
+#include <cerrno>
+#include <cstdlib>
 #include <cstring>
 #include <cwchar>
 #include <memory>
diff --git a/src/builtin_argparse.cpp b/src/builtin_argparse.cpp
index 2153a9379..113988106 100644
--- a/src/builtin_argparse.cpp
+++ b/src/builtin_argparse.cpp
@@ -5,11 +5,10 @@
 
 #include "builtin_argparse.h"
 
-#include <errno.h>
-#include <stddef.h>
-#include <stdint.h>
-
 #include <algorithm>
+#include <cerrno>
+#include <cstddef>
+#include <cstdint>
 #include <cwchar>
 #include <memory>
 #include <string>
diff --git a/src/builtin_bg.cpp b/src/builtin_bg.cpp
index 83b95faae..96e42d8b7 100644
--- a/src/builtin_bg.cpp
+++ b/src/builtin_bg.cpp
@@ -3,9 +3,8 @@
 
 #include "builtin_bg.h"
 
-#include <errno.h>
-#include <stdlib.h>
-
+#include <cerrno>
+#include <cstdlib>
 #include <memory>
 #include <vector>
 
diff --git a/src/builtin_bind.cpp b/src/builtin_bind.cpp
index 29c36c9a2..7b478c88c 100644
--- a/src/builtin_bind.cpp
+++ b/src/builtin_bind.cpp
@@ -3,9 +3,8 @@
 
 #include "builtin_bind.h"
 
-#include <errno.h>
-#include <stddef.h>
-
+#include <cerrno>
+#include <cstddef>
 #include <memory>
 #include <set>
 #include <string>
diff --git a/src/builtin_block.cpp b/src/builtin_block.cpp
index 00d70dfe0..2a44992f1 100644
--- a/src/builtin_block.cpp
+++ b/src/builtin_block.cpp
@@ -3,7 +3,7 @@
 
 #include "builtin_block.h"
 
-#include <stddef.h>
+#include <cstddef>
 
 #include "builtin.h"
 #include "common.h"
diff --git a/src/builtin_builtin.cpp b/src/builtin_builtin.cpp
index e4ff40924..1ce2c04a8 100644
--- a/src/builtin_builtin.cpp
+++ b/src/builtin_builtin.cpp
@@ -3,9 +3,8 @@
 
 #include "builtin.h"
 
-#include <stddef.h>
-
 #include <algorithm>
+#include <cstddef>
 #include <string>
 
 #include "builtin_builtin.h"
diff --git a/src/builtin_cd.cpp b/src/builtin_cd.cpp
index 31654747e..98b3b4666 100644
--- a/src/builtin_cd.cpp
+++ b/src/builtin_cd.cpp
@@ -3,10 +3,11 @@
 
 #include "builtin_cd.h"
 
-#include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 
+#include <cerrno>
+
 #include "builtin.h"
 #include "common.h"
 #include "env.h"
diff --git a/src/builtin_commandline.cpp b/src/builtin_commandline.cpp
index 568dfcca5..c342bf229 100644
--- a/src/builtin_commandline.cpp
+++ b/src/builtin_commandline.cpp
@@ -1,10 +1,9 @@
 // Functions used for implementing the commandline builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include <errno.h>
-#include <stddef.h>
-#include <stdlib.h>
-
+#include <cerrno>
+#include <cstddef>
+#include <cstdlib>
 #include <cwchar>
 
 #include "builtin.h"
@@ -129,7 +128,7 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
     const wchar_t *current_buffer = 0;
 
     // What the commandline builtin considers to be the current cursor position.
-    size_t current_cursor_pos = static_cast<size_t>(-1);
+    auto current_cursor_pos = static_cast<size_t>(-1);
 
     wchar_t *cmd = argv[0];
     int buffer_part = 0;
diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index 319bd3e9d..8355486e0 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -1,8 +1,7 @@
 // Functions used for implementing the complete builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include <stddef.h>
-
+#include <cstddef>
 #include <cwchar>
 #include <memory>
 #include <string>
diff --git a/src/builtin_disown.cpp b/src/builtin_disown.cpp
index aa1115883..8b90830fa 100644
--- a/src/builtin_disown.cpp
+++ b/src/builtin_disown.cpp
@@ -3,9 +3,8 @@
 
 #include "builtin_disown.h"
 
-#include <errno.h>
-#include <signal.h>
-
+#include <cerrno>
+#include <csignal>
 #include <set>
 
 #include "builtin.h"
diff --git a/src/builtin_echo.cpp b/src/builtin_echo.cpp
index cb5b9f891..45165d0f8 100644
--- a/src/builtin_echo.cpp
+++ b/src/builtin_echo.cpp
@@ -3,8 +3,8 @@
 
 #include "builtin_echo.h"
 
-#include <limits.h>
-#include <stddef.h>
+#include <climits>
+#include <cstddef>
 
 #include "builtin.h"
 #include "common.h"
diff --git a/src/builtin_eval.cpp b/src/builtin_eval.cpp
index 26621e321..8de6c10e2 100644
--- a/src/builtin_eval.cpp
+++ b/src/builtin_eval.cpp
@@ -1,8 +1,8 @@
 // Functions for executing the eval builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include <errno.h>
-#include <stddef.h>
+#include <cerrno>
+#include <cstddef>
 
 #include "builtin.h"
 #include "common.h"
diff --git a/src/builtin_exit.cpp b/src/builtin_exit.cpp
index 6f8e9d58c..3b77cd521 100644
--- a/src/builtin_exit.cpp
+++ b/src/builtin_exit.cpp
@@ -3,8 +3,8 @@
 
 #include "builtin_exit.h"
 
-#include <errno.h>
-#include <stddef.h>
+#include <cerrno>
+#include <cstddef>
 
 #include "builtin.h"
 #include "common.h"
diff --git a/src/builtin_fg.cpp b/src/builtin_fg.cpp
index 4a7808cab..231d435fd 100644
--- a/src/builtin_fg.cpp
+++ b/src/builtin_fg.cpp
@@ -3,10 +3,9 @@
 
 #include "builtin_fg.h"
 
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
 #include <cwchar>
 
 #include "builtin.h"
diff --git a/src/builtin_function.cpp b/src/builtin_function.cpp
index c1b07ee26..9df7ca366 100644
--- a/src/builtin_function.cpp
+++ b/src/builtin_function.cpp
@@ -3,11 +3,11 @@
 
 #include "builtin_function.h"
 
-#include <errno.h>
-#include <stddef.h>
-#include <stdlib.h>
 #include <unistd.h>
 
+#include <cerrno>
+#include <cstddef>
+#include <cstdlib>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index 8e5cca2d0..bf2001e38 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -3,10 +3,10 @@
 
 #include "builtin_functions.h"
 
-#include <stddef.h>
 #include <unistd.h>
 
 #include <algorithm>
+#include <cstddef>
 #include <cwchar>
 #include <map>
 #include <memory>
diff --git a/src/builtin_history.cpp b/src/builtin_history.cpp
index b5acd3b07..991dbf288 100644
--- a/src/builtin_history.cpp
+++ b/src/builtin_history.cpp
@@ -3,10 +3,9 @@
 
 #include "builtin_history.h"
 
-#include <errno.h>
-#include <stddef.h>
-#include <stdint.h>
-
+#include <cerrno>
+#include <cstddef>
+#include <cstdint>
 #include <cwchar>
 #include <string>
 #include <vector>
diff --git a/src/builtin_jobs.cpp b/src/builtin_jobs.cpp
index da8389513..0a7b12e38 100644
--- a/src/builtin_jobs.cpp
+++ b/src/builtin_jobs.cpp
@@ -1,10 +1,11 @@
 // Functions for executing the jobs builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include <errno.h>
-#include <stddef.h>
 #include <sys/time.h>
 
+#include <cerrno>
+#include <cstddef>
+
 #include "builtin.h"
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
diff --git a/src/builtin_math.cpp b/src/builtin_math.cpp
index f8e579db8..451410471 100644
--- a/src/builtin_math.cpp
+++ b/src/builtin_math.cpp
@@ -3,11 +3,10 @@
 
 #include "builtin_math.h"
 
-#include <errno.h>
-#include <stddef.h>
-
 #include <algorithm>
+#include <cerrno>
 #include <cmath>
+#include <cstddef>
 #include <cstring>
 #include <limits>
 #include <string>
diff --git a/src/builtin_printf.cpp b/src/builtin_printf.cpp
index 0d3539e31..d6401fc9a 100644
--- a/src/builtin_printf.cpp
+++ b/src/builtin_printf.cpp
@@ -50,18 +50,18 @@
 // This file has been imported from source code of printf command in GNU Coreutils version 6.9.
 #include "config.h"  // IWYU pragma: keep
 
-#include <errno.h>
-#include <limits.h>
-#include <locale.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdlib.h>
 #include <sys/types.h>
-#include <wctype.h>
 
+#include <cerrno>
+#include <climits>
+#include <clocale>
+#include <cstdarg>
+#include <cstddef>
+#include <cstdint>
+#include <cstdlib>
 #include <cstring>
 #include <cwchar>
+#include <cwctype>
 
 #include "builtin.h"
 #include "common.h"
diff --git a/src/builtin_random.cpp b/src/builtin_random.cpp
index 3478810fd..46771c766 100644
--- a/src/builtin_random.cpp
+++ b/src/builtin_random.cpp
@@ -3,10 +3,9 @@
 
 #include "builtin_random.h"
 
-#include <errno.h>
-#include <stdint.h>
-
 #include <algorithm>
+#include <cerrno>
+#include <cstdint>
 #include <cwchar>
 #include <random>
 
diff --git a/src/builtin_read.cpp b/src/builtin_read.cpp
index 7505c4214..90d03f8cc 100644
--- a/src/builtin_read.cpp
+++ b/src/builtin_read.cpp
@@ -3,14 +3,14 @@
 
 #include "builtin_read.h"
 
-#include <errno.h>
-#include <limits.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
 
 #include <algorithm>
+#include <cerrno>
+#include <climits>
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
 #include <cstring>
 #include <cwchar>
 #include <memory>
diff --git a/src/builtin_realpath.cpp b/src/builtin_realpath.cpp
index 3a4ea7c89..09858ee9d 100644
--- a/src/builtin_realpath.cpp
+++ b/src/builtin_realpath.cpp
@@ -3,9 +3,8 @@
 
 #include "builtin_realpath.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
+#include <cstdio>
+#include <cstdlib>
 #include <cstring>
 #include <cwchar>
 
diff --git a/src/builtin_return.cpp b/src/builtin_return.cpp
index 11d8354c9..7663efb75 100644
--- a/src/builtin_return.cpp
+++ b/src/builtin_return.cpp
@@ -3,8 +3,8 @@
 
 #include "builtin_return.h"
 
-#include <errno.h>
-#include <stddef.h>
+#include <cerrno>
+#include <cstddef>
 
 #include "builtin.h"
 #include "common.h"
diff --git a/src/builtin_set.cpp b/src/builtin_set.cpp
index 3556fd2f2..4246a04bb 100644
--- a/src/builtin_set.cpp
+++ b/src/builtin_set.cpp
@@ -1,13 +1,13 @@
 // Functions used for implementing the set builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include <errno.h>
-#include <stddef.h>
-#include <stdlib.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <algorithm>
+#include <cerrno>
+#include <cstddef>
+#include <cstdlib>
 #include <cstring>
 #include <cwchar>
 #include <iterator>
diff --git a/src/builtin_set_color.cpp b/src/builtin_set_color.cpp
index 0867cc684..ecd78fb88 100644
--- a/src/builtin_set_color.cpp
+++ b/src/builtin_set_color.cpp
@@ -1,8 +1,8 @@
 // Functions used for implementing the set_color builtin.
 #include "config.h"
 
-#include <stddef.h>
-#include <stdlib.h>
+#include <cstddef>
+#include <cstdlib>
 
 #if HAVE_CURSES_H
 #include <curses.h>
diff --git a/src/builtin_status.cpp b/src/builtin_status.cpp
index cc974878d..fd97f5e0f 100644
--- a/src/builtin_status.cpp
+++ b/src/builtin_status.cpp
@@ -3,8 +3,7 @@
 
 #include "builtin_status.h"
 
-#include <stddef.h>
-
+#include <cstddef>
 #include <cwchar>
 #include <string>
 
diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index 4863fcb8a..b82edb713 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -5,15 +5,13 @@
 #ifdef _WIN32
 #define PCRE2_STATIC
 #endif
-#include <errno.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <wctype.h>
-
 #include <algorithm>
+#include <cerrno>
+#include <climits>
+#include <cstdarg>
+#include <cstddef>
+#include <cstdint>
+#include <cstdlib>
 #include <cwchar>
 #include <cwctype>
 #include <iterator>
diff --git a/src/builtin_test.cpp b/src/builtin_test.cpp
index 1411054ea..b821589ac 100644
--- a/src/builtin_test.cpp
+++ b/src/builtin_test.cpp
@@ -5,16 +5,16 @@
 
 #include "builtin.h"
 
-#include <errno.h>
-#include <stdarg.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <wctype.h>
 
+#include <cerrno>
 #include <cmath>
+#include <cstdarg>
 #include <cstring>
 #include <cwchar>
+#include <cwctype>
 #include <memory>
 #include <string>
 #include <type_traits>
diff --git a/src/builtin_ulimit.cpp b/src/builtin_ulimit.cpp
index f50d9b4e9..d00eb03fc 100644
--- a/src/builtin_ulimit.cpp
+++ b/src/builtin_ulimit.cpp
@@ -1,10 +1,11 @@
 // Functions used for implementing the ulimit builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include <errno.h>
-#include <stddef.h>
 #include <sys/resource.h>
 
+#include <cerrno>
+#include <cstddef>
+
 #include "builtin.h"
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
diff --git a/src/color.cpp b/src/color.cpp
index c41dfd38e..6594cee92 100644
--- a/src/color.cpp
+++ b/src/color.cpp
@@ -3,10 +3,9 @@
 
 #include "color.h"
 
-#include <stddef.h>
-#include <stdint.h>
-#include <stdlib.h>
-
+#include <cstddef>
+#include <cstdint>
+#include <cstdlib>
 #include <cwchar>  // IWYU pragma: keep
 
 #include "common.h"
diff --git a/src/fish_test_helper.cpp b/src/fish_test_helper.cpp
index dd70b3ed6..20310f495 100644
--- a/src/fish_test_helper.cpp
+++ b/src/fish_test_helper.cpp
@@ -1,12 +1,13 @@
 // fish_test_helper is a little program with no fish dependencies that acts like certain other
 // programs, allowing fish to test its behavior.
 
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 
+#include <csignal>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+
 static void become_foreground_then_print_stderr() {
     if (tcsetpgrp(STDOUT_FILENO, getpgrp()) < 0) {
         perror("tcsetgrp");