From 6fd42d9fe493c151f20a7141c0b7fc36578cb727 Mon Sep 17 00:00:00 2001
From: Andrew Gaul <andrew@gaul.org>
Date: Fri, 12 Jul 2019 03:33:53 -0700
Subject: [PATCH] Prefer modern C headers

Found and fixed via clang-tidy.
---
 src/addhead.cpp      |  6 +++---
 src/cache.cpp        |  4 ++--
 src/common_auth.cpp  |  8 ++++----
 src/curl.cpp         | 12 ++++++------
 src/fdcache.cpp      |  8 ++++----
 src/openssl_auth.cpp |  8 ++++----
 src/s3fs.cpp         | 10 +++++-----
 src/s3fs_util.cpp    |  8 ++++----
 src/string_util.cpp  | 10 +++++-----
 9 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/addhead.cpp b/src/addhead.cpp
index 298da70..5a182e9 100644
--- a/src/addhead.cpp
+++ b/src/addhead.cpp
@@ -18,9 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <syslog.h>
 #include <curl/curl.h>
 #include <sstream>
diff --git a/src/cache.cpp b/src/cache.cpp
index eed6954..9be2e9b 100644
--- a/src/cache.cpp
+++ b/src/cache.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <stdio.h>
+#include <cstdio>
 #include <sys/stat.h>
 #include <sys/types.h>
 #ifndef HAVE_CLOCK_GETTIME
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <stdint.h>
 #include <pthread.h>
-#include <string.h>
+#include <cstring>
 #include <syslog.h>
 #include <string>
 #include <map>
diff --git a/src/common_auth.cpp b/src/common_auth.cpp
index f11bc35..eb363a1 100644
--- a/src/common_auth.cpp
+++ b/src/common_auth.cpp
@@ -18,10 +18,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <climits>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <string>
 
 #include "s3fs_auth.h"
diff --git a/src/curl.cpp b/src/curl.cpp
index eea5805..bebfb48 100644
--- a/src/curl.cpp
+++ b/src/curl.cpp
@@ -18,18 +18,18 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <ctime>
+#include <cstring>
 #include <unistd.h>
 #include <stdint.h>
 #include <fcntl.h>
 #include <dirent.h>
-#include <errno.h>
+#include <cerrno>
 #include <syslog.h>
 #include <pthread.h>
-#include <assert.h>
+#include <cassert>
 #include <curl/curl.h>
 #include <iostream>
 #include <fstream>
diff --git a/src/fdcache.cpp b/src/fdcache.cpp
index d57c1d1..d05085b 100644
--- a/src/fdcache.cpp
+++ b/src/fdcache.cpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -28,8 +28,8 @@
 #include <unistd.h>
 #include <pthread.h>
 #include <syslog.h>
-#include <errno.h>
-#include <string.h>
+#include <cerrno>
+#include <cstring>
 #include <dirent.h>
 #include <curl/curl.h>
 #include <string>
diff --git a/src/openssl_auth.cpp b/src/openssl_auth.cpp
index 998cc23..92595ce 100644
--- a/src/openssl_auth.cpp
+++ b/src/openssl_auth.cpp
@@ -18,15 +18,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cerrno>
 #include <pthread.h>
 #include <unistd.h>
 #include <syslog.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <string.h>
+#include <cstring>
 #include <openssl/bio.h>
 #include <openssl/buffer.h>
 #include <openssl/evp.h>
diff --git a/src/s3fs.cpp b/src/s3fs.cpp
index 7fad8a6..9be883b 100644
--- a/src/s3fs.cpp
+++ b/src/s3fs.cpp
@@ -18,13 +18,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <unistd.h>
 #include <stdint.h>
 #include <dirent.h>
-#include <errno.h>
+#include <cerrno>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <libxml/xpath.h>
@@ -34,7 +34,7 @@
 #include <pwd.h>
 #include <grp.h>
 #include <getopt.h>
-#include <signal.h>
+#include <csignal>
 
 #include <fstream>
 #include <vector>
diff --git a/src/s3fs_util.cpp b/src/s3fs_util.cpp
index 52f5bf6..67f8c6e 100644
--- a/src/s3fs_util.cpp
+++ b/src/s3fs_util.cpp
@@ -18,11 +18,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <libgen.h>
 #include <sys/stat.h>
 #include <pwd.h>
diff --git a/src/string_util.cpp b/src/string_util.cpp
index 5b19ecb..7f55f94 100644
--- a/src/string_util.cpp
+++ b/src/string_util.cpp
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <climits>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <syslog.h>
-#include <time.h>
+#include <ctime>
 
 #include <sstream>
 #include <string>