Fix modernize-deprecated-headers errors in csync tests

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>

diff --git a/test/csync/csync_tests/check_csync_exclude.cpp b/test/csync/csync_tests/check_csync_exclude.cpp
index 304e1c5ce25bf56a9c2b020faea421b48a737aec..b55a72e54ed49a1575c3a236cd5aab14cee6bed2 100644 (file)
--- 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 fc7fea67e26c5e41c46fb11b0073507dccec7daf..6ff70e4eec005ac0f8565c724462ac42435ee81f 100644 (file)
--- 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 7d3733bc62a6a0ed04b6d21f738e436a013bc188..faf66400b6532a4b84ed614520c03ac0df288c2b 100644 (file)
--- 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 045518ecc0dc2a2759418f331757b91c84ec1c19..16fb48f533ee6592af4e09e4f863def326276f3f 100644 (file)
--- 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 7d429f0a245a2414fd8c136eff18b5560ddf58f5..674dab00856b2a167dc9b6155c7f6ffea8558965 100644 (file)
--- 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 5fee8ca83c8c738851efeceaddcc42ba44e36636..88e300ccc9a07ed72e2e8f9b2ca93e29e871c166 100644 (file)
--- 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"