From f323f8b4bc22d3613ba56359b2902a2e825872d1 Mon Sep 17 00:00:00 2001
From: Kevin Ottens <kevin.ottens@nextcloud.com>
Date: Tue, 1 Sep 2020 17:49:17 +0200
Subject: [PATCH] Fix modernize-deprecated-headers errors in csync tests

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
---
 test/csync/csync_tests/check_csync_exclude.cpp | 6 +++---
 test/csync/csync_tests/check_csync_misc.cpp    | 2 +-
 test/csync/encoding_tests/check_encoding.cpp   | 2 +-
 test/csync/torture.h                           | 6 +++---
 test/csync/vio_tests/check_vio.cpp             | 4 ++--
 test/csync/vio_tests/check_vio_ext.cpp         | 6 +++---
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/test/csync/csync_tests/check_csync_exclude.cpp b/test/csync/csync_tests/check_csync_exclude.cpp
index 304e1c5ce..b55a72e54 100644
--- a/test/csync/csync_tests/check_csync_exclude.cpp
+++ b/test/csync/csync_tests/check_csync_exclude.cpp
@@ -18,10 +18,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "config_csync.h"
-#include <string.h>
-#include <time.h>
+#include <cstring>
+#include <ctime>
 #include <sys/time.h>
-#include <stdio.h>
+#include <cstdio>
 
 #define CSYNC_TEST 1
 #include "csync_exclude.cpp"
diff --git a/test/csync/csync_tests/check_csync_misc.cpp b/test/csync/csync_tests/check_csync_misc.cpp
index fc7fea67e..6ff70e4ee 100644
--- a/test/csync/csync_tests/check_csync_misc.cpp
+++ b/test/csync/csync_tests/check_csync_misc.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "common/utility.h"
-#include <stdlib.h>
+#include <cstdlib>
 #include "torture.h"
 
 static void check_csync_normalize_etag(void **state)
diff --git a/test/csync/encoding_tests/check_encoding.cpp b/test/csync/encoding_tests/check_encoding.cpp
index 7d3733bc6..faf66400b 100644
--- a/test/csync/encoding_tests/check_encoding.cpp
+++ b/test/csync/encoding_tests/check_encoding.cpp
@@ -17,7 +17,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include <stdio.h>
+#include <cstdio>
 #include "c_string.h"
 #include "c_utf8.h"
 #include "common/filesystembase.h"
diff --git a/test/csync/torture.h b/test/csync/torture.h
index 045518ecc..16fb48f53 100644
--- a/test/csync/torture.h
+++ b/test/csync/torture.h
@@ -24,9 +24,9 @@
 extern "C" {
 #endif
 
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
+#include <stdarg.h> // NOLINT sometimes compiled in C mode
+#include <stddef.h> // NOLINT sometimes compiled in C mode
+#include <setjmp.h> // NOLINT sometimes compiled in C mode
 
 #include <cmocka.h>
 
diff --git a/test/csync/vio_tests/check_vio.cpp b/test/csync/vio_tests/check_vio.cpp
index 7d429f0a2..674dab008 100644
--- a/test/csync/vio_tests/check_vio.cpp
+++ b/test/csync/vio_tests/check_vio.cpp
@@ -20,8 +20,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <string.h>
-#include <errno.h>
+#include <cstring>
+#include <cerrno>
 
 #include "csync_private.h"
 #include "std/c_utf8.h"
diff --git a/test/csync/vio_tests/check_vio_ext.cpp b/test/csync/vio_tests/check_vio_ext.cpp
index 5fee8ca83..88e300ccc 100644
--- a/test/csync/vio_tests/check_vio_ext.cpp
+++ b/test/csync/vio_tests/check_vio_ext.cpp
@@ -20,9 +20,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <string.h>
-#include <errno.h>
-#include <stdio.h>
+#include <cstring>
+#include <cerrno>
+#include <cstdio>
 
 #include "csync_private.h"
 #include "std/c_utf8.h"
-- 
2.30.2