From 912d6736126a73a17a9f5de88acd4b3cb075621d Mon Sep 17 00:00:00 2001
From: Arvin Schnell <aschnell@suse.de>
Date: Tue, 28 Nov 2023 08:44:25 +0100
Subject: [PATCH] - coding style

---
 client/errors.h             | 4 ----
 server/FilesTransferTask.cc | 2 +-
 server/snapperd.cc          | 4 ++--
 snapper/Acls.cc             | 3 ++-
 snapper/AppUtil.cc          | 6 +++---
 snapper/AppUtil2.cc         | 2 +-
 snapper/Compare.cc          | 4 ++--
 snapper/Comparison.cc       | 4 ++--
 snapper/Exception.cc        | 4 ++--
 snapper/Logger.cc           | 2 +-
 snapper/XAttributes.cc      | 2 +-
 11 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/client/errors.h b/client/errors.h
index 44f465ca..0b6dc733 100644
--- a/client/errors.h
+++ b/client/errors.h
@@ -21,10 +21,6 @@
  */
 
 
-#include <string>
-
-using std::string;
-
 #include "dbus/DBusConnection.h"
 
 
diff --git a/server/FilesTransferTask.cc b/server/FilesTransferTask.cc
index 27d55d9f..b708e23d 100644
--- a/server/FilesTransferTask.cc
+++ b/server/FilesTransferTask.cc
@@ -19,7 +19,7 @@
  */
 
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "FilesTransferTask.h"
 
diff --git a/server/snapperd.cc b/server/snapperd.cc
index a0277c21..d9adb93c 100644
--- a/server/snapperd.cc
+++ b/server/snapperd.cc
@@ -21,9 +21,9 @@
  */
 
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <getopt.h>
-#include <signal.h>
+#include <csignal>
 #include <iostream>
 #include <string>
 
diff --git a/snapper/Acls.cc b/snapper/Acls.cc
index cfd2cc58..3886f723 100644
--- a/snapper/Acls.cc
+++ b/snapper/Acls.cc
@@ -18,10 +18,11 @@
  *
  */
 
+
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <errno.h>
+#include <cerrno>
 
 #include "snapper/Acls.h"
 #include "snapper/AppUtil.h"
diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
index 99565707..f3432e03 100644
--- a/snapper/AppUtil.cc
+++ b/snapper/AppUtil.cc
@@ -21,12 +21,12 @@
  */
 
 
-#include <errno.h>
-#include <stdarg.h>
+#include <cerrno>
+#include <cstdarg>
 #include <unistd.h>
 #include <fcntl.h>
 #include <glob.h>
-#include <string.h>
+#include <cstring>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/utsname.h>
diff --git a/snapper/AppUtil2.cc b/snapper/AppUtil2.cc
index 8316c7d1..4766f57d 100644
--- a/snapper/AppUtil2.cc
+++ b/snapper/AppUtil2.cc
@@ -28,7 +28,7 @@
 #define _POSIX_C_SOURCE 200809L
 #undef _GNU_SOURCE
 
-#include <string.h>
+#include <cstring>
 #include <string>
 
 
diff --git a/snapper/Compare.cc b/snapper/Compare.cc
index 45b932dc..9c072c87 100644
--- a/snapper/Compare.cc
+++ b/snapper/Compare.cc
@@ -22,13 +22,13 @@
 
 #include "config.h"
 
-#include <string.h>
+#include <cstring>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <dirent.h>
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <algorithm>
 #include <boost/thread.hpp>
 
diff --git a/snapper/Comparison.cc b/snapper/Comparison.cc
index 986a389e..7bcd80e5 100644
--- a/snapper/Comparison.cc
+++ b/snapper/Comparison.cc
@@ -26,8 +26,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <string.h>
-#include <errno.h>
+#include <cstring>
+#include <cerrno>
 #include <regex>
 
 #include "snapper/Comparison.h"
diff --git a/snapper/Exception.cc b/snapper/Exception.cc
index f3c99d2b..16f73c91 100644
--- a/snapper/Exception.cc
+++ b/snapper/Exception.cc
@@ -25,8 +25,8 @@
  */
 
 
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdio>
 #include <sstream>
 
 #include "snapper/Exception.h"
diff --git a/snapper/Logger.cc b/snapper/Logger.cc
index e5d5784d..3befe1ef 100644
--- a/snapper/Logger.cc
+++ b/snapper/Logger.cc
@@ -23,7 +23,7 @@
 
 #include <pwd.h>
 #include <unistd.h>
-#include <string.h>
+#include <cstring>
 #include <sys/types.h>
 #include <libxml/xmlerror.h>
 #include <string>
diff --git a/snapper/XAttributes.cc b/snapper/XAttributes.cc
index 266ed2b9..ccce8edf 100644
--- a/snapper/XAttributes.cc
+++ b/snapper/XAttributes.cc
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <iomanip>
 #include <boost/scoped_array.hpp>
 #include <algorithm>
-- 
2.47.3