diff options
author | Alex Chernyakhovsky <alex@achernya.com> | 2023-07-30 18:10:08 -0400 |
---|---|---|
committer | Alex Chernyakhovsky <achernya@mit.edu> | 2023-07-30 19:02:51 -0400 |
commit | cf542739cc6a11ae92404964fa3f246af4f89d0c (patch) | |
tree | 19b30e1f0aa5f21fffe4979e2ee2ad2463cebcd0 | |
parent | 19ad493dcbc639e29ad07e5442ffc9f3e5af91d6 (diff) |
Switch to C++ versions of standard C headers
56 files changed, 205 insertions, 191 deletions
diff --git a/src/crypto/base64.cc b/src/crypto/base64.cc index 6d8a9d1..ae38e3e 100644 --- a/src/crypto/base64.cc +++ b/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" diff --git a/src/crypto/base64.h b/src/crypto/base64.h index e216dc0..80de7c6 100644 --- a/src/crypto/base64.h +++ b/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 ); diff --git a/src/crypto/byteorder.h b/src/crypto/byteorder.h index 9148287..fe7e8cd 100644 --- a/src/crypto/byteorder.h +++ b/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 diff --git a/src/crypto/crypto.cc b/src/crypto/crypto.cc index b530ed9..62e04da 100644 --- a/src/crypto/crypto.cc +++ b/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" diff --git a/src/crypto/crypto.h b/src/crypto/crypto.h index dfde2ba..a3c26a8 100644 --- a/src/crypto/crypto.h +++ b/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 ); diff --git a/src/crypto/ocb_internal.cc b/src/crypto/ocb_internal.cc index c25d7bd..0d4848c 100644 --- a/src/crypto/ocb_internal.cc +++ b/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 diff --git a/src/crypto/prng.h b/src/crypto/prng.h index 693080e..03e0b72 100644 --- a/src/crypto/prng.h +++ b/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" diff --git a/src/examples/benchmark.cc b/src/examples/benchmark.cc index a52797a..1c60083 100644 --- a/src/examples/benchmark.cc +++ b/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> diff --git a/src/examples/decrypt.cc b/src/examples/decrypt.cc index 384cf58..5f053a8 100644 --- a/src/examples/decrypt.cc +++ b/src/examples/decrypt.cc @@ -30,7 +30,7 @@ also delete it here. */ -#include <stdio.h> +#include <cstdio> #include <iostream> #include <sstream> diff --git a/src/examples/encrypt.cc b/src/examples/encrypt.cc index b5afefe..bba0cc3 100644 --- a/src/examples/encrypt.cc +++ b/src/examples/encrypt.cc @@ -30,7 +30,7 @@ also delete it here. */ -#include <stdio.h> +#include <cstdio> #include <iostream> #include <sstream> diff --git a/src/examples/ntester.cc b/src/examples/ntester.cc index bd26409..c1660c4 100644 --- a/src/examples/ntester.cc +++ b/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" diff --git a/src/examples/parse.cc b/src/examples/parse.cc index 26c4043..1883928 100644 --- a/src/examples/parse.cc +++ b/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> diff --git a/src/examples/termemu.cc b/src/examples/termemu.cc index e8dd3b5..8921ac7 100644 --- a/src/examples/termemu.cc +++ b/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> diff --git a/src/frontend/mosh-client.cc b/src/frontend/mosh-client.cc index 242aa48..5fa703d 100644 --- a/src/frontend/mosh-client.cc +++ b/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" diff --git a/src/frontend/mosh-server.cc b/src/frontend/mosh-server.cc index 9324fdb..cfbd170 100644 --- a/src/frontend/mosh-server.cc +++ b/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> diff --git a/src/frontend/stmclient.cc b/src/frontend/stmclient.cc index 2a1a37a..8bec8a7 100644 --- a/src/frontend/stmclient.cc +++ b/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> diff --git a/src/frontend/stmclient.h b/src/frontend/stmclient.h index e811e26..09084dd 100644 --- a/src/frontend/stmclient.h +++ b/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" diff --git a/src/frontend/terminaloverlay.cc b/src/frontend/terminaloverlay.cc index 74dfeff..d8a3872 100644 --- a/src/frontend/terminaloverlay.cc +++ b/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" diff --git a/src/frontend/terminaloverlay.h b/src/frontend/terminaloverlay.h index 99bbc24..70c64e7 100644 --- a/src/frontend/terminaloverlay.h +++ b/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; diff --git a/src/network/network.cc b/src/network/network.cc index ea58bae..2b11fe7 100644 --- a/src/network/network.cc +++ b/src/network/network.cc @@ -32,6 +32,10 @@ #include "src/include/config.h" +#include <cassert> +#include <cerrno> +#include <cstring> + #include <sys/types.h> #include <sys/socket.h> #ifdef HAVE_SYS_UIO_H @@ -39,9 +43,6 @@ #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" diff --git a/src/network/network.h b/src/network/network.h index 35042f7..56c37fb 100644 --- a/src/network/network.h +++ b/src/network/network.h @@ -33,16 +33,17 @@ #ifndef NETWORK_HPP #define NETWORK_HPP -#include <stdint.h> +#include <cassert> +#include <cmath> +#include <cstdint> +#include <cstring> #include <deque> -#include <sys/socket.h> -#include <netinet/in.h> +#include <exception> #include <string> -#include <math.h> #include <vector> -#include <assert.h> -#include <exception> -#include <string.h> + +#include <sys/socket.h> +#include <netinet/in.h> #include "src/crypto/crypto.h" diff --git a/src/network/networktransport.h b/src/network/networktransport.h index 11e00c4..55209d5 100644 --- a/src/network/networktransport.h +++ b/src/network/networktransport.h @@ -33,17 +33,16 @@ #ifndef NETWORK_TRANSPORT_HPP #define NETWORK_TRANSPORT_HPP -#include <string> -#include <signal.h> -#include <time.h> +#include <csignal> +#include <ctime> #include <list> +#include <string> #include <vector> #include "src/network/network.h" #include "src/network/transportsender.h" #include "transportfragment.h" - namespace Network { template <class MyState, class RemoteState> class Transport diff --git a/src/network/transportfragment.cc b/src/network/transportfragment.cc index 8870c3d..004e4d7 100644 --- a/src/network/transportfragment.cc +++ b/src/network/transportfragment.cc @@ -30,7 +30,7 @@ also delete it here. */ -#include <assert.h> +#include <cassert> #include "src/crypto/byteorder.h" #include "transportfragment.h" diff --git a/src/network/transportfragment.h b/src/network/transportfragment.h index b9bf7fd..ff09542 100644 --- a/src/network/transportfragment.h +++ b/src/network/transportfragment.h @@ -33,9 +33,9 @@ #ifndef TRANSPORT_FRAGMENT_HPP #define TRANSPORT_FRAGMENT_HPP -#include <stdint.h> -#include <vector> +#include <cstdint> #include <string> +#include <vector> #include "src/protobufs/transportinstruction.pb.h" diff --git a/src/network/transportsender-impl.h b/src/network/transportsender-impl.h index 90de4bc..3c8cf6f 100644 --- a/src/network/transportsender-impl.h +++ b/src/network/transportsender-impl.h @@ -34,16 +34,15 @@ #define TRANSPORT_SENDER_IMPL_HPP #include <algorithm> +#include <climits> +#include <cstdio> +#include <cstdlib> +#include <ctime> #include <list> -#include <stdio.h> -#include <stdlib.h> -#include <time.h> #include "src/network/transportsender.h" #include "transportfragment.h" -#include <limits.h> - using namespace Network; template <class MyState> diff --git a/src/statesync/completeterminal.cc b/src/statesync/completeterminal.cc index 47a5c74..1f8fed7 100644 --- a/src/statesync/completeterminal.cc +++ b/src/statesync/completeterminal.cc @@ -30,12 +30,11 @@ also delete it here. */ -#include "src/statesync/completeterminal.h" -#include "src/util/fatal_assert.h" +#include <climits> #include "src/protobufs/hostinput.pb.h" - -#include <limits.h> +#include "src/statesync/completeterminal.h" +#include "src/util/fatal_assert.h" using namespace std; using namespace Parser; diff --git a/src/statesync/completeterminal.h b/src/statesync/completeterminal.h index 2483ef4..e126462 100644 --- a/src/statesync/completeterminal.h +++ b/src/statesync/completeterminal.h @@ -33,8 +33,8 @@ #ifndef COMPLETE_TERMINAL_HPP #define COMPLETE_TERMINAL_HPP +#include <cstdint> #include <list> -#include <stdint.h> #include "src/terminal/parser.h" #include "src/terminal/terminal.h" diff --git a/src/statesync/user.cc b/src/statesync/user.cc index b1da825..0b1073e 100644 --- a/src/statesync/user.cc +++ b/src/statesync/user.cc @@ -30,7 +30,7 @@ also delete it here. */ -#include <assert.h> +#include <cassert> #include <typeinfo> #include "src/statesync/user.h" diff --git a/src/statesync/user.h b/src/statesync/user.h index d98d23b..a3257b6 100644 --- a/src/statesync/user.h +++ b/src/statesync/user.h @@ -33,10 +33,10 @@ #ifndef USER_HPP #define USER_HPP +#include <cassert> #include <deque> #include <list> #include <string> -#include <assert.h> #include "src/terminal/parseraction.h" diff --git a/src/terminal/parser.cc b/src/terminal/parser.cc index d1f00b7..7ab3ca4 100644 --- a/src/terminal/parser.cc +++ b/src/terminal/parser.cc @@ -30,11 +30,11 @@ also delete it here. */ -#include <assert.h> +#include <cassert> +#include <cerrno> +#include <cstdint> +#include <cwchar> #include <typeinfo> -#include <errno.h> -#include <wchar.h> -#include <stdint.h> #include "src/terminal/parser.h" diff --git a/src/terminal/parser.h b/src/terminal/parser.h index f76096c..f1876c9 100644 --- a/src/terminal/parser.h +++ b/src/terminal/parser.h @@ -36,8 +36,8 @@ /* Based on Paul Williams's parser, http://www.vt100.net/emu/dec_ansi_parser */ -#include <wchar.h> -#include <string.h> +#include <cstring> +#include <cwchar> #include "parsertransition.h" #include "src/terminal/parseraction.h" diff --git a/src/terminal/parseraction.cc b/src/terminal/parseraction.cc index 531d2a9..4ca2b06 100644 --- a/src/terminal/parseraction.cc +++ b/src/terminal/parseraction.cc @@ -30,8 +30,8 @@ also delete it here. */ -#include <stdio.h> -#include <wctype.h> +#include <cstdio> +#include <cwctype> #include "src/terminal/parseraction.h" #include "src/terminal/terminal.h" diff --git a/src/terminal/parsertransition.h b/src/terminal/parsertransition.h index cc2c6f5..aca909f 100644 --- a/src/terminal/parsertransition.h +++ b/src/terminal/parsertransition.h @@ -33,7 +33,7 @@ #ifndef PARSERTRANSITION_HPP #define PARSERTRANSITION_HPP -#include <stdlib.h> +#include <cstdlib> #include "src/terminal/parseraction.h" diff --git a/src/terminal/terminal.cc b/src/terminal/terminal.cc index 95a1fd8..1798477 100644 --- a/src/terminal/terminal.cc +++ b/src/terminal/terminal.cc @@ -30,12 +30,13 @@ also delete it here. */ -#include <assert.h> -#include <string.h> -#include <stdlib.h> -#include <unistd.h> +#include <cassert> +#include <cstdlib> +#include <cstring> #include <typeinfo> +#include <unistd.h> + #include "src/terminal/terminal.h" using namespace Terminal; diff --git a/src/terminal/terminal.h b/src/terminal/terminal.h index f4412ba..2b803d7 100644 --- a/src/terminal/terminal.h +++ b/src/terminal/terminal.h @@ -33,10 +33,10 @@ #ifndef TERMINAL_CPP #define TERMINAL_CPP -#include <wchar.h> -#include <stdio.h> -#include <vector> +#include <cstdio> +#include <cwchar> #include <deque> +#include <vector> #include "src/terminal/parseraction.h" #include "src/terminal/terminalframebuffer.h" diff --git a/src/terminal/terminaldispatcher.cc b/src/terminal/terminaldispatcher.cc index 450aef3..4d9ce70 100644 --- a/src/terminal/terminaldispatcher.cc +++ b/src/terminal/terminaldispatcher.cc @@ -30,11 +30,11 @@ also delete it here. */ -#include <stdio.h> -#include <assert.h> -#include <string.h> -#include <errno.h> -#include <stdlib.h> +#include <cassert> +#include <cerrno> +#include <cstdio> +#include <cstdlib> +#include <cstring> #include "terminaldispatcher.h" #include "src/terminal/parseraction.h" diff --git a/src/terminal/terminaldisplay.cc b/src/terminal/terminaldisplay.cc index 10411cc..a957010 100644 --- a/src/terminal/terminaldisplay.cc +++ b/src/terminal/terminaldisplay.cc @@ -30,7 +30,7 @@ also delete it here. */ -#include <stdio.h> +#include <cstdio> #include "terminaldisplay.h" #include "src/terminal/terminalframebuffer.h" diff --git a/src/terminal/terminaldisplayinit.cc b/src/terminal/terminaldisplayinit.cc index 3defa9d..1888915 100644 --- a/src/terminal/terminaldisplayinit.cc +++ b/src/terminal/terminaldisplayinit.cc @@ -57,8 +57,8 @@ #else # error "SysV or X/Open-compatible Curses header file required" #endif -#include <stdlib.h> -#include <string.h> +#include <cstdlib> +#include <cstring> using namespace Terminal; diff --git a/src/terminal/terminalframebuffer.cc b/src/terminal/terminalframebuffer.cc index 1abab39..3a285a8 100644 --- a/src/terminal/terminalframebuffer.cc +++ b/src/terminal/terminalframebuffer.cc @@ -30,9 +30,9 @@ also delete it here. */ -#include <assert.h> -#include <stdio.h> -#include <stdlib.h> +#include <cassert> +#include <cstdio> +#include <cstdlib> #include "src/terminal/terminalframebuffer.h" diff --git a/src/terminal/terminalframebuffer.h b/src/terminal/terminalframebuffer.h index 0f77e42..58c766c 100644 --- a/src/terminal/terminalframebuffer.h +++ b/src/terminal/terminalframebuffer.h @@ -33,10 +33,9 @@ #ifndef TERMINALFB_HPP #define TERMINALFB_HPP -#include <assert.h> -#include <limits.h> -#include <stdint.h> - +#include <cassert> +#include <climits> +#include <cstdint> #include <deque> #include <list> #include <memory> diff --git a/src/terminal/terminalfunctions.cc b/src/terminal/terminalfunctions.cc index 2125413..31f33b0 100644 --- a/src/terminal/terminalfunctions.cc +++ b/src/terminal/terminalfunctions.cc @@ -30,10 +30,11 @@ also delete it here. */ -#include <unistd.h> #include <algorithm> +#include <cstdio> #include <string> -#include <stdio.h> + +#include <unistd.h> #include "terminaldispatcher.h" #include "src/terminal/terminalframebuffer.h" diff --git a/src/terminal/terminaluserinput.cc b/src/terminal/terminaluserinput.cc index 1c4891f..cf8125e 100644 --- a/src/terminal/terminaluserinput.cc +++ b/src/terminal/terminaluserinput.cc @@ -30,7 +30,8 @@ also delete it here. */ -#include <assert.h> +#include <cassert> + #include "terminaluserinput.h" using namespace Terminal; diff --git a/src/tests/base64.cc b/src/tests/base64.cc index 7d49c88..3ee2f3c 100644 --- a/src/tests/base64.cc +++ b/src/tests/base64.cc @@ -37,9 +37,9 @@ client and server. It does not particularly test any code written for the Mosh project. */ -#include <stdint.h> -#include <string.h> -#include <stdlib.h> +#include <cstdint> +#include <cstring> +#include <cstdlib> #include "src/crypto/base64.h" #include "base64_vector.h" diff --git a/src/tests/encrypt-decrypt.cc b/src/tests/encrypt-decrypt.cc index e09f0a8..9829763 100644 --- a/src/tests/encrypt-decrypt.cc +++ b/src/tests/encrypt-decrypt.cc @@ -34,10 +34,10 @@ messages, interspersed with some random bad ciphertexts which we need to reject. */ -#include <stdio.h> +#include <cstdio> #define __STDC_FORMAT_MACROS -#include <inttypes.h> +#include <cinttypes> #include "src/crypto/crypto.h" #include "src/crypto/prng.h" diff --git a/src/tests/inpty.cc b/src/tests/inpty.cc index f57968e..cab63e4 100644 --- a/src/tests/inpty.cc +++ b/src/tests/inpty.cc @@ -32,13 +32,14 @@ #include "src/include/config.h" +#include <cerrno> +#include <csignal> +#include <cstdio> +#include <cstdlib> +#include <cstring> + #include <sys/types.h> #include <sys/wait.h> -#include <errno.h> -#include <signal.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <termios.h> #include <unistd.h> diff --git a/src/tests/is-utf8-locale.cc b/src/tests/is-utf8-locale.cc index 67ef283..f997a8a 100644 --- a/src/tests/is-utf8-locale.cc +++ b/src/tests/is-utf8-locale.cc @@ -30,7 +30,7 @@ also delete it here. */ -#include <stdio.h> +#include <cstdio> #include "src/util/locale_utils.h" diff --git a/src/tests/ocb-aes.cc b/src/tests/ocb-aes.cc index 8eefb8d..62c3024 100644 --- a/src/tests/ocb-aes.cc +++ b/src/tests/ocb-aes.cc @@ -37,9 +37,9 @@ client and server. It does not particularly test any code written for the Mosh project. */ -#include <stdint.h> -#include <string.h> -#include <stdlib.h> +#include <cstdint> +#include <cstdlib> +#include <cstring> #include <memory> #include "src/crypto/ae.h" diff --git a/src/tests/test_utils.cc b/src/tests/test_utils.cc index fcdb3fd..a51f3fe 100644 --- a/src/tests/test_utils.cc +++ b/src/tests/test_utils.cc @@ -30,7 +30,7 @@ also delete it here. */ -#include <stdio.h> +#include <cstdio> #include "test_utils.h" diff --git a/src/util/dos_assert.h b/src/util/dos_assert.h index 2eff034..447a75e 100644 --- a/src/util/dos_assert.h +++ b/src/util/dos_assert.h @@ -33,8 +33,8 @@ #ifndef DOS_ASSERT_HPP #define DOS_ASSERT_HPP -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> #include "src/crypto/crypto.h" diff --git a/src/util/fatal_assert.h b/src/util/fatal_assert.h index 9827f73..b3c3564 100644 --- a/src/util/fatal_assert.h +++ b/src/util/fatal_assert.h @@ -33,8 +33,8 @@ #ifndef FATAL_ASSERT_HPP #define FATAL_ASSERT_HPP -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> static void fatal_error( const char *expression, const char *file, int line, const char *function ) { diff --git a/src/util/locale_utils.cc b/src/util/locale_utils.cc index e8093d5..390c297 100644 --- a/src/util/locale_utils.cc +++ b/src/util/locale_utils.cc @@ -32,11 +32,11 @@ #include "src/include/config.h" -#include <string.h> -#include <stdlib.h> -#include <stdio.h> -#include <locale.h> -#include <errno.h> +#include <cerrno> +#include <clocale> +#include <cstdio> +#include <cstdlib> +#include <cstring> #include <string> #if HAVE_LANGINFO_H diff --git a/src/util/pty_compat.cc b/src/util/pty_compat.cc index ce543f7..ec439f5 100644 --- a/src/util/pty_compat.cc +++ b/src/util/pty_compat.cc @@ -33,14 +33,15 @@ #include "src/include/config.h" #if !defined(HAVE_FORKPTY) || !defined(HAVE_CFMAKERAW) -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> +#include <cstdio> +#include <cstdlib> +#include <cstring> + #include <fcntl.h> #include <sys/ioctl.h> #include <sys/stropts.h> #include <termios.h> +#include <unistd.h> #include "src/util/pty_compat.h" diff --git a/src/util/select.h b/src/util/select.h index 7361a64..e50807b 100644 --- a/src/util/select.h +++ b/src/util/select.h @@ -33,11 +33,12 @@ #ifndef SELECT_HPP #define SELECT_HPP -#include <string.h> -#include <errno.h> -#include <signal.h> +#include <cassert> +#include <cerrno> +#include <csignal> +#include <cstring> + #include <sys/select.h> -#include <assert.h> #include "src/util/fatal_assert.h" #include "src/util/timestamp.h" diff --git a/src/util/swrite.cc b/src/util/swrite.cc index d3c2ba0..bbdc4f6 100644 --- a/src/util/swrite.cc +++ b/src/util/swrite.cc @@ -30,9 +30,10 @@ also delete it here. */ +#include <cstdio> +#include <cstring> + #include <unistd.h> -#include <string.h> -#include <stdio.h> #include "src/util/swrite.h" diff --git a/src/util/timestamp.cc b/src/util/timestamp.cc index 3eaf283..4cbc797 100644 --- a/src/util/timestamp.cc +++ b/src/util/timestamp.cc @@ -34,10 +34,10 @@ #include "src/util/timestamp.h" -#include <errno.h> +#include <cerrno> #if HAVE_CLOCK_GETTIME -#include <time.h> +#include <ctime> #endif #if HAVE_MACH_ABSOLUTE_TIME #include <mach/error.h> @@ -45,7 +45,7 @@ #endif #if HAVE_GETTIMEOFDAY #include <sys/time.h> -#include <stdio.h> +#include <cstdio> #endif // On Apple systems CLOCK_MONOTONIC is unfortunately able to go diff --git a/src/util/timestamp.h b/src/util/timestamp.h index 9ba4947..07cf5b4 100644 --- a/src/util/timestamp.h +++ b/src/util/timestamp.h @@ -33,7 +33,7 @@ #ifndef TIMESTAMP_HPP #define TIMESTAMP_HPP -#include <stdint.h> +#include <cstdint> void freeze_timestamp( void ); uint64_t frozen_timestamp( void ); |