[Box Backup-commit] COMMIT r2465 - in box/trunk: bin/bbackupctl bin/bbackupquery bin/bbstoreaccounts lib/backupclient lib/common lib/raidfile

[boxbackup-dev@boxbackup.org]

Author: chris
Date: 2009-03-24 15:22:54 +0000 (Tue, 24 Mar 2009)
New Revision: 2465

Modified:
   box/trunk/bin/bbackupctl/bbackupctl.cpp
   box/trunk/bin/bbackupquery/BackupQueries.cpp
   box/trunk/bin/bbackupquery/bbackupquery.cpp
   box/trunk/bin/bbstoreaccounts/bbstoreaccounts.cpp
   box/trunk/lib/backupclient/BackupStoreFile.h
   box/trunk/lib/common/Logging.cpp
   box/trunk/lib/common/Timer.cpp
   box/trunk/lib/common/WaitForEvent.h
   box/trunk/lib/raidfile/RaidFileRead.cpp
Log:
Switch to C++ include file names.


Modified: box/trunk/bin/bbackupctl/bbackupctl.cpp
===================================================================
--- box/trunk/bin/bbackupctl/bbackupctl.cpp	2009-03-24 15:20:24 UTC (rev 2464)
+++ box/trunk/bin/bbackupctl/bbackupctl.cpp	2009-03-24 15:22:54 UTC (rev 2465)
@@ -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"

Modified: box/trunk/bin/bbackupquery/BackupQueries.cpp
===================================================================
--- box/trunk/bin/bbackupquery/BackupQueries.cpp	2009-03-24 15:20:24 UTC (rev 2464)
+++ box/trunk/bin/bbackupquery/BackupQueries.cpp	2009-03-24 15:22:54 UTC (rev 2465)
@@ -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"

Modified: box/trunk/bin/bbackupquery/bbackupquery.cpp
===================================================================
--- box/trunk/bin/bbackupquery/bbackupquery.cpp	2009-03-24 15:20:24 UTC (rev 2464)
+++ box/trunk/bin/bbackupquery/bbackupquery.cpp	2009-03-24 15:22:54 UTC (rev 2465)
@@ -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"

Modified: box/trunk/bin/bbstoreaccounts/bbstoreaccounts.cpp
===================================================================
--- box/trunk/bin/bbstoreaccounts/bbstoreaccounts.cpp	2009-03-24 15:20:24 UTC (rev 2464)
+++ box/trunk/bin/bbstoreaccounts/bbstoreaccounts.cpp	2009-03-24 15:22:54 UTC (rev 2465)
@@ -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>

Modified: box/trunk/lib/backupclient/BackupStoreFile.h
===================================================================
--- box/trunk/lib/backupclient/BackupStoreFile.h	2009-03-24 15:20:24 UTC (rev 2464)
+++ box/trunk/lib/backupclient/BackupStoreFile.h	2009-03-24 15:22:54 UTC (rev 2465)
@@ -10,8 +10,7 @@
 #ifndef BACKUPSTOREFILE__H
 #define BACKUPSTOREFILE__H
 
-#include <stdlib.h>
-
+#include <cstdlib>
 #include <memory>
 
 #include "BackupClientFileAttributes.h"

Modified: box/trunk/lib/common/Logging.cpp
===================================================================
--- box/trunk/lib/common/Logging.cpp	2009-03-24 15:20:24 UTC (rev 2464)
+++ box/trunk/lib/common/Logging.cpp	2009-03-24 15:22:54 UTC (rev 2465)
@@ -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"

Modified: box/trunk/lib/common/Timer.cpp
===================================================================
--- box/trunk/lib/common/Timer.cpp	2009-03-24 15:20:24 UTC (rev 2464)
+++ box/trunk/lib/common/Timer.cpp	2009-03-24 15:22:54 UTC (rev 2465)
@@ -15,6 +15,7 @@
 #include "Box.h"
 
 #include <signal.h>
+#include <cstring>
 
 #include "Timer.h"
 #include "Logging.h"

Modified: box/trunk/lib/common/WaitForEvent.h
===================================================================
--- box/trunk/lib/common/WaitForEvent.h	2009-03-24 15:20:24 UTC (rev 2464)
+++ box/trunk/lib/common/WaitForEvent.h	2009-03-24 15:22:54 UTC (rev 2465)
@@ -10,7 +10,7 @@
 #ifndef WAITFOREVENT__H
 #define WAITFOREVENT__H
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #ifdef HAVE_KQUEUE
 	#include <sys/event.h>

Modified: box/trunk/lib/raidfile/RaidFileRead.cpp
===================================================================
--- box/trunk/lib/raidfile/RaidFileRead.cpp	2009-03-24 15:20:24 UTC (rev 2464)
+++ box/trunk/lib/raidfile/RaidFileRead.cpp	2009-03-24 15:22:54 UTC (rev 2465)
@@ -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 <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <map>
 #include <memory>
-#include <map>
 
 #include "RaidFileRead.h"
 #include "RaidFileException.h"