diff options
-rw-r--r-- | bin/bbackupctl/bbackupctl.cpp | 3 | ||||
-rw-r--r-- | bin/bbackupquery/BackupQueries.cpp | 4 | ||||
-rw-r--r-- | bin/bbackupquery/bbackupquery.cpp | 3 | ||||
-rw-r--r-- | bin/bbstoreaccounts/bbstoreaccounts.cpp | 2 | ||||
-rw-r--r-- | lib/backupclient/BackupStoreFile.h | 3 | ||||
-rw-r--r-- | lib/common/Logging.cpp | 2 | ||||
-rw-r--r-- | lib/common/Timer.cpp | 1 | ||||
-rw-r--r-- | lib/common/WaitForEvent.h | 2 | ||||
-rw-r--r-- | lib/raidfile/RaidFileRead.cpp | 8 |
9 files changed, 15 insertions, 13 deletions
diff --git a/bin/bbackupctl/bbackupctl.cpp b/bin/bbackupctl/bbackupctl.cpp index 0340f400..2c41f614 100644 --- a/bin/bbackupctl/bbackupctl.cpp +++ b/bin/bbackupctl/bbackupctl.cpp @@ -10,12 +10,13 @@ #include "Box.h" #include <stdio.h> -#include <stdlib.h> #ifdef HAVE_UNISTD_H #include <unistd.h> #endif +#include <cstdlib> + #include "MainHelper.h" #include "BoxPortsAndFiles.h" #include "BackupDaemonConfigVerify.h" diff --git a/bin/bbackupquery/BackupQueries.cpp b/bin/bbackupquery/BackupQueries.cpp index 9e6bc9a5..687dcb05 100644 --- a/bin/bbackupquery/BackupQueries.cpp +++ b/bin/bbackupquery/BackupQueries.cpp @@ -13,7 +13,6 @@ #include <unistd.h> #endif -#include <string.h> #include <stdio.h> #include <errno.h> #include <stdlib.h> @@ -25,10 +24,11 @@ #include <dirent.h> #endif -#include <set> +#include <cstring> #include <limits> #include <iostream> #include <ostream> +#include <set> #include "BackupClientFileAttributes.h" #include "BackupClientMakeExcludeList.h" diff --git a/bin/bbackupquery/bbackupquery.cpp b/bin/bbackupquery/bbackupquery.cpp index bbe8dd14..33860dcf 100644 --- a/bin/bbackupquery/bbackupquery.cpp +++ b/bin/bbackupquery/bbackupquery.cpp @@ -15,7 +15,6 @@ #include <errno.h> #include <stdio.h> -#include <stdlib.h> #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -38,6 +37,8 @@ #endif #endif +#include <cstdlib> + #include "MainHelper.h" #include "BoxPortsAndFiles.h" #include "BackupDaemonConfigVerify.h" diff --git a/bin/bbstoreaccounts/bbstoreaccounts.cpp b/bin/bbstoreaccounts/bbstoreaccounts.cpp index e1700278..71114ef4 100644 --- a/bin/bbstoreaccounts/bbstoreaccounts.cpp +++ b/bin/bbstoreaccounts/bbstoreaccounts.cpp @@ -11,12 +11,12 @@ #include <limits.h> #include <stdio.h> -#include <string.h> #include <unistd.h> #include <sys/types.h> #include <algorithm> +#include <cstring> #include <iostream> #include <ostream> #include <vector> diff --git a/lib/backupclient/BackupStoreFile.h b/lib/backupclient/BackupStoreFile.h index 7bd75fa5..f38cd821 100644 --- a/lib/backupclient/BackupStoreFile.h +++ b/lib/backupclient/BackupStoreFile.h @@ -10,8 +10,7 @@ #ifndef BACKUPSTOREFILE__H #define BACKUPSTOREFILE__H -#include <stdlib.h> - +#include <cstdlib> #include <memory> #include "BackupClientFileAttributes.h" diff --git a/lib/common/Logging.cpp b/lib/common/Logging.cpp index 802f6a3b..d16b1514 100644 --- a/lib/common/Logging.cpp +++ b/lib/common/Logging.cpp @@ -10,7 +10,6 @@ #include "Box.h" #include <errno.h> -#include <string.h> #include <time.h> #ifdef HAVE_SYSLOG_H @@ -20,6 +19,7 @@ #include <unistd.h> #endif +#include <cstring> #include <iomanip> #include "BoxTime.h" diff --git a/lib/common/Timer.cpp b/lib/common/Timer.cpp index cac86512..01afa91b 100644 --- a/lib/common/Timer.cpp +++ b/lib/common/Timer.cpp @@ -15,6 +15,7 @@ #include "Box.h" #include <signal.h> +#include <cstring> #include "Timer.h" #include "Logging.h" diff --git a/lib/common/WaitForEvent.h b/lib/common/WaitForEvent.h index 9febf5d4..045d6d67 100644 --- a/lib/common/WaitForEvent.h +++ b/lib/common/WaitForEvent.h @@ -10,7 +10,7 @@ #ifndef WAITFOREVENT__H #define WAITFOREVENT__H -#include <stdlib.h> +#include <cstdlib> #ifdef HAVE_KQUEUE #include <sys/event.h> diff --git a/lib/raidfile/RaidFileRead.cpp b/lib/raidfile/RaidFileRead.cpp index 4d32df34..0a79be57 100644 --- a/lib/raidfile/RaidFileRead.cpp +++ b/lib/raidfile/RaidFileRead.cpp @@ -12,7 +12,6 @@ #include <errno.h> #include <fcntl.h> #include <stdarg.h> -#include <stdlib.h> #include <unistd.h> #include <sys/stat.h> @@ -26,10 +25,11 @@ #include <dirent.h> #endif -#include <stdio.h> -#include <string.h> -#include <memory> +#include <cstdio> +#include <cstdlib> +#include <cstring> #include <map> +#include <memory> #include "RaidFileRead.h" #include "RaidFileException.h" |