Switch to C++ versions of standard C headers

src/crypto/base64.cc

@@ -30,8 +30,8 @@
     also delete it here.
 */
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "src/util/fatal_assert.h"
 #include "src/crypto/base64.h"

src/crypto/base64.h

@@ -30,7 +30,7 @@
     also delete it here.
 */
 
-#include <stdint.h>
+#include <cstdint>
 
 bool base64_decode( const char *b64, const size_t b64_len,
 		    uint8_t *raw, size_t *raw_len );

src/crypto/byteorder.h

@@ -60,7 +60,7 @@
 
 /* Use our fallback implementation, which is correct for any endianness. */
 
-#include <stdint.h>
+#include <cstdint>
 
 /* Make sure they aren't macros */
 #undef htobe64

src/crypto/crypto.cc

@@ -30,14 +30,15 @@
     also delete it here.
 */
 
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <sys/resource.h>
+#include <cassert>
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <fstream>
 
+#include <sys/resource.h>
+
 #include "src/crypto/byteorder.h"
 #include "src/crypto/crypto.h"
 #include "src/crypto/base64.h"

src/crypto/crypto.h

@@ -34,11 +34,12 @@
 #define CRYPTO_HPP
 
 #include "src/crypto/ae.h"
-#include <string>
-#include <string.h>
-#include <stdint.h>
-#include <stdlib.h>
+
+#include <cstdint>
+#include <cstdlib>
+#include <cstring>
 #include <exception>
+#include <string>
 
 
 long int myatoi( const char *str );

src/crypto/ocb_internal.cc

@@ -87,8 +87,8 @@
 #include "src/crypto/ae.h"
 #include "src/crypto/crypto.h"
 #include "src/util/fatal_assert.h"
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #if defined(HAVE_STRINGS_H)
 #include <strings.h>
 #endif

src/crypto/prng.h

@@ -33,9 +33,9 @@
 #ifndef PRNG_HPP
 #define PRNG_HPP
 
-#include <string>
-#include <stdint.h>
+#include <cstdint>
 #include <fstream>
+#include <string>
 
 #include "src/crypto/crypto.h"
 

src/examples/benchmark.cc

@@ -32,19 +32,20 @@
 
 #include "src/include/config.h"
 
-#include <errno.h>
-#include <locale.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cerrno>
+#include <climits>
+#include <clocale>
+#include <csignal>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
+#include <exception>
+
+#include <pwd.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <pwd.h>
-#include <signal.h>
-#include <time.h>
-#include <limits.h>
-#include <exception>
+#include <unistd.h>
 
 #if HAVE_PTY_H
 #include <pty.h>

src/examples/decrypt.cc

@@ -30,7 +30,7 @@
     also delete it here.
 */
 
-#include <stdio.h>
+#include <cstdio>
 #include <iostream>
 #include <sstream>
 

src/examples/encrypt.cc

@@ -30,7 +30,7 @@
     also delete it here.
 */
 
-#include <stdio.h>
+#include <cstdio>
 #include <iostream>
 #include <sstream>
 

src/examples/ntester.cc

@@ -30,11 +30,11 @@
     also delete it here.
 */
 
+#include <memory>
+
 #include <termios.h>
 #include <unistd.h>
 
-#include <memory>
-
 #include "src/statesync/user.h"
 #include "src/util/fatal_assert.h"
 #include "src/util/pty_compat.h"

src/examples/parse.cc

@@ -32,18 +32,19 @@
 
 #include "src/include/config.h"
 
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <errno.h>
-#include <string.h>
-#include <locale.h>
-#include <wchar.h>
-#include <assert.h>
-#include <wctype.h>
+#include <cassert>
+#include <cerrno>
+#include <clocale>
+#include <csignal>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cwchar>
+#include <cwctype>
 #include <typeinfo>
+
 #include <termios.h>
+#include <unistd.h>
 
 #if HAVE_PTY_H
 #include <pty.h>

src/examples/termemu.cc

@@ -32,25 +32,26 @@
 
 #include "src/include/config.h"
 
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <errno.h>
-#include <string.h>
-#include <locale.h>
-#include <wchar.h>
-#include <assert.h>
-#include <wctype.h>
+#include <cassert>
+#include <cerrno>
+#include <clocale>
+#include <csignal>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cwchar>
+#include <cwctype>
+#include <exception>
 #include <typeinfo>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
+
 #include <fcntl.h>
-#include <termios.h>
-#include <sys/types.h>
 #include <pwd.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
 #include <sys/time.h>
-#include <exception>
+#include <sys/types.h>
+#include <termios.h>
+#include <unistd.h>
 
 #if HAVE_PTY_H
 #include <pty.h>

src/frontend/mosh-client.cc

@@ -33,7 +33,8 @@
 #include "src/include/config.h"
 #include "src/include/version.h"
 
-#include <stdlib.h>
+#include <cstdlib>
+
 #include <unistd.h>
 
 #include "stmclient.h"

src/frontend/mosh-server.cc

@@ -33,33 +33,34 @@
 #include "src/include/config.h"
 #include "src/include/version.h"
 
-#include <err.h>
-#include <errno.h>
-#include <locale.h>
-#include <string.h>
-#include <strings.h>
+#include <cerrno>
+#include <clocale>
+#include <csignal>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
 #include <sstream>
-#include <termios.h>
-#include <unistd.h>
+#include <typeinfo>
+
+#include <err.h>
 #include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <inttypes.h>
+#include <netdb.h>
+#include <pwd.h>
+#include <strings.h>
 #include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
 #include <sys/types.h>
-#include <pwd.h>
-#include <typeinfo>
-#include <signal.h>
+#include <termios.h>
+#include <unistd.h>
 #ifdef HAVE_UTEMPTER
 #include <utempter.h>
 #endif
 #ifdef HAVE_SYSLOG
 #include <syslog.h>
 #endif
-#include <sys/socket.h>
-#include <netdb.h>
-#include <time.h>
-#include <sys/stat.h>
-#include <inttypes.h>
 
 #ifdef HAVE_UTMPX_H
 #include <utmpx.h>

src/frontend/stmclient.cc

@@ -32,18 +32,19 @@
 
 #include "src/include/config.h"
 
+#include <cerrno>
+#include <clocale>
+#include <csignal>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
+
 #include <err.h>
-#include <errno.h>
-#include <locale.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <pwd.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include <pwd.h>
-#include <signal.h>
-#include <time.h>
+#include <unistd.h>
 
 #if HAVE_PTY_H
 #include <pty.h>

src/frontend/stmclient.h

@@ -33,11 +33,12 @@
 #ifndef STM_CLIENT_HPP
 #define STM_CLIENT_HPP
 
-#include <sys/ioctl.h>
-#include <termios.h>
 #include <string>
 #include <memory>
 
+#include <sys/ioctl.h>
+#include <termios.h>
+
 #include "src/statesync/completeterminal.h"
 #include "src/network/networktransport.h"
 #include "src/statesync/user.h"

src/frontend/terminaloverlay.cc

@@ -31,10 +31,10 @@
 */
 
 #include <algorithm>
-#include <wchar.h>
+#include <climits>
+#include <cwchar>
 #include <list>
 #include <typeinfo>
-#include <limits.h>
 
 #include "src/frontend/terminaloverlay.h"
 

src/frontend/terminaloverlay.h

@@ -38,8 +38,8 @@
 #include "src/network/transportsender.h"
 #include "src/terminal/parser.h"
 
+#include <climits>
 #include <vector>
-#include <limits.h>
 
 namespace Overlay {
   using namespace Terminal;

src/network/network.cc

@@ -32,16 +32,17 @@
 
 #include "src/include/config.h"
 
+#include <cassert>
+#include <cerrno>
+#include <cstring>
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #ifdef HAVE_SYS_UIO_H
 #include <sys/uio.h>
 #endif
 #include <netdb.h>
 #include <netinet/in.h>
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "src/util/dos_assert.h"