Code modernization: Convert from deprecated C standard library headers

src/Anon.cc

@@ -1,9 +1,9 @@
 #include "zeek/Anon.h"
 
-#include <assert.h>
-#include <stdlib.h>
 #include <sys/time.h>
 #include <unistd.h>
+#include <cassert>
+#include <cstdlib>
 
 #include "zeek/Event.h"
 #include "zeek/ID.h"

src/Base64.cc

@@ -2,7 +2,7 @@
 
 #include "zeek/zeek-config.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "zeek/Conn.h"
 #include "zeek/Reporter.h"

src/Conn.cc

@@ -5,7 +5,7 @@
 #include "zeek/zeek-config.h"
 
 #include <binpac.h>
-#include <ctype.h>
+#include <cctype>
 
 #include "zeek/Desc.h"
 #include "zeek/Event.h"

src/DFA.h

@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include <assert.h>
 #include <sys/types.h> // for u_char
+#include <cassert>
 #include <map>
 #include <string>
 

src/DNS_Mgr.cc

@@ -4,25 +4,25 @@
 
 #include "zeek/zeek-config.h"
 
-#include <errno.h>
 #include <netdb.h>
 #include <netinet/in.h>
-#include <stdlib.h>
 #include <sys/select.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <algorithm>
+#include <cerrno>
+#include <cstdlib>
 #include <vector>
 
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
-#include <time.h>
+#include <ctime>
 #elif defined(HAVE_SYS_TIME_H)
 #include <sys/time.h>
 #else
-#include <time.h>
+#include <ctime>
 #endif
 
 #include <ztd/out_ptr.hpp>

src/DbgBreakpoint.cc

@@ -4,7 +4,7 @@
 
 #include "zeek/zeek-config.h"
 
-#include <assert.h>
+#include <cassert>
 
 #include "zeek/Debug.h"
 #include "zeek/Desc.h"

src/Debug.cc

@@ -4,10 +4,10 @@
 
 #include "zeek/zeek-config.h"
 
-#include <ctype.h>
+#include <cctype>
-#include <signal.h>
+#include <csignal>
-#include <stdarg.h>
+#include <cstdarg>
-#include <stdio.h>
+#include <cstdio>
 #include <string>
 
 #ifdef HAVE_READLINE

src/DebugCmds.cc

@@ -5,10 +5,10 @@
 
 #include "zeek/zeek-config.h"
 
-#include <assert.h>
 #include <regex.h>
-#include <string.h>
 #include <sys/types.h>
+#include <cassert>
+#include <cstring>
 
 #include "zeek/DbgBreakpoint.h"
 #include "zeek/Debug.h"

src/DebugCmds.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <deque>
 #include <string>
 #include <vector>

src/DebugLogger.cc

@@ -2,8 +2,8 @@
 
 #include "zeek/DebugLogger.h"
 
-#include <stdlib.h>
 #include <unistd.h>
+#include <cstdlib>
 
 #include "zeek/RunState.h"
 #include "zeek/plugin/Plugin.h"

src/Desc.cc

@@ -4,10 +4,10 @@
 
 #include "zeek/zeek-config.h"
 
-#include <errno.h>
+#include <cerrno>
-#include <math.h>
+#include <cmath>
-#include <stdlib.h>
+#include <cstdlib>
-#include <string.h>
+#include <cstring>
 
 #include "zeek/3rdparty/ConvertUTF.h"
 #include "zeek/File.h"
@@ -179,7 +179,7 @@ void ODesc::Add(double d, bool no_exp)
 			return v < 0 ? -v < tolerance : v < tolerance;
 		};
 
-		if ( approx_equal(d, nearbyint(d), 1e-9) && isfinite(d) && ! strchr(tmp, 'e') )
+		if ( approx_equal(d, nearbyint(d), 1e-9) && std::isfinite(d) && ! strchr(tmp, 'e') )
 			// disambiguate from integer
 			Add(".0");
 		}

src/Dict.cc

@@ -7,9 +7,9 @@
 #ifdef HAVE_MEMORY_H
 #include <memory.h>
 #endif
-#include <signal.h>
 #include <algorithm>
 #include <climits>
+#include <csignal>
 #include <fstream>
 
 #include "zeek/3rdparty/doctest.h"

src/File.cc

@@ -7,19 +7,19 @@
 #include <sys/types.h>
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
-#include <time.h>
+#include <ctime>
 #else
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #else
-#include <time.h>
+#include <ctime>
 #endif
 #endif
-#include <errno.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <algorithm>
+#include <cerrno>
 
 #include "zeek/Attr.h"
 #include "zeek/Desc.h"

src/Flare.cc

@@ -2,9 +2,9 @@
 
 #include "zeek/Flare.h"
 
-#include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <cerrno>
 
 #include "zeek/Reporter.h"
 

src/Func.cc

@@ -6,15 +6,15 @@
 #include "zeek/zeek-config.h"
 
 #include <broker/error.hh>
-#include <ctype.h>
-#include <errno.h>
 #include <netdb.h>
 #include <netinet/in.h>
-#include <signal.h>
-#include <stdlib.h>
 #include <sys/param.h>
 #include <unistd.h>
 #include <algorithm>
+#include <cctype>
+#include <cerrno>
+#include <csignal>
+#include <cstdlib>
 
 #include "zeek/Base64.h"
 #include "zeek/Debug.h"

src/Hash.h

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "zeek/util.h" // for bro_int_t
 

src/IntSet.cc

@@ -2,10 +2,7 @@
 
 #include "zeek/zeek-config.h"
 
-#ifdef HAVE_MEMORY_H
+#include <cstring>
-#include <memory.h>
-#endif
-#include <stdlib.h>
 
 namespace zeek::detail
 	{

src/IntSet.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <string.h>
+#include <cstring>
 
 namespace zeek::detail
 	{

src/Obj.cc

@@ -4,7 +4,7 @@
 
 #include "zeek/zeek-config.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "zeek/Desc.h"
 #include "zeek/File.h"

src/Obj.h

@@ -4,7 +4,7 @@
 
 #include "zeek/zeek-config.h"
 
-#include <limits.h>
+#include <climits>
 
 namespace zeek
 	{

src/Pipe.cc

@@ -2,9 +2,9 @@
 
 #include "zeek/Pipe.h"
 
-#include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <cerrno>
 #include <cstdio>
 
 #include "zeek/Reporter.h"

src/PolicyFile.cc

@@ -2,11 +2,11 @@
 
 #include "zeek/zeek-config.h"
 
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <cassert>
+#include <cerrno>
+#include <cstdio>
 #include <map>
 #include <string>
 #include <vector>

src/PriorityQueue.cc

@@ -4,8 +4,8 @@
 
 #include "zeek/zeek-config.h"
 
-#include <stdio.h>
+#include <cstdio>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "zeek/Reporter.h"
 #include "zeek/util.h"

src/PriorityQueue.h

@@ -4,8 +4,8 @@
 
 #include "zeek/zeek-config.h"
 
-#include <math.h>
+#include <cmath>
-#include <stdint.h>
+#include <cstdint>
 
 namespace zeek::detail
 	{

src/Queue.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <string.h>
+#include <cstring>
 #include <iterator>
 
 // Queue.h --

src/RE.cc

@@ -4,7 +4,7 @@
 
 #include "zeek/zeek-config.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <utility>
 
 #include "zeek/CCL.h"

src/RE.h

@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include <ctype.h>
 #include <sys/types.h> // for u_char
+#include <cctype>
 #include <map>
 #include <set>
 #include <string>

src/RandTest.cc

@@ -14,7 +14,7 @@
 
 #include "zeek/RandTest.h"
 
-#include <math.h>
+#include <cmath>
 
 constexpr double log2of10 = 3.32192809488736234787;
 

src/RandTest.h

@@ -2,7 +2,7 @@
 
 #include "zeek/zeek-config.h"
 
-#include <stdint.h>
+#include <cstdint>
 
 #define RT_MONTEN                                                                                  \
 	6 /* Bytes used as Monte Carlo                                                                 \

src/Reassem.h

@@ -2,10 +2,10 @@
 
 #pragma once
 
-#include <assert.h>
-#include <string.h>
 #include <sys/types.h> // for u_char
+#include <cassert>
 #include <cstdint>
+#include <cstring>
 #include <map>
 
 #include "zeek/Obj.h"

src/Rule.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <limits.h>
+#include <climits>
-#include <stdint.h>
+#include <cstdint>
 #include <map>
 #include <string>
 

src/RuleCondition.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <stdint.h> // for u_char
 #include <sys/types.h> // for u_char
+#include <cstdint> // for u_char
 
 #include "zeek/util.h"
 

src/RuleMatcher.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <limits.h>
 #include <sys/types.h> // for u_char
+#include <climits>
 #include <functional>
 #include <map>
 #include <set>

src/RunState.cc

@@ -7,18 +7,18 @@
 #include <sys/types.h>
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
-#include <time.h>
+#include <ctime>
 #else
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #else
-#include <time.h>
+#include <ctime>
 #endif
 #endif
 
-#include <signal.h>
-#include <stdlib.h>
 #include <unistd.h>
+#include <csignal>
+#include <cstdlib>
 
 extern "C"
 	{

src/ScannedFile.cc

@@ -1,7 +1,7 @@
 #include "zeek/ScannedFile.h"
 
-#include <errno.h>
+#include <cerrno>
-#include <limits.h> // for PATH_MAX
+#include <climits> // for PATH_MAX
 
 #include "zeek/DebugLogger.h"
 #include "zeek/Reporter.h"

src/SerializationFormat.cc

@@ -1,6 +1,6 @@
 #include "zeek/SerializationFormat.h"
 
-#include <ctype.h>
+#include <cctype>
 
 #include "zeek/DebugLogger.h"
 #include "zeek/IPAddr.h"

src/SerializationFormat.h

@@ -4,7 +4,7 @@
 
 #include "zeek/zeek-config.h"
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 
 struct in_addr;

src/SmithWaterman.cc

@@ -4,8 +4,8 @@
 
 #include "zeek/zeek-config.h"
 
-#include <ctype.h>
 #include <algorithm>
+#include <cctype>
 
 #include "zeek/Reporter.h"
 #include "zeek/Val.h"

src/Stats.h

@@ -4,10 +4,10 @@
 
 #include "zeek/zeek-config.h"
 
-#include <stdint.h>
 #include <sys/resource.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#include <cstdint>
 #include <memory>
 
 namespace zeek

src/Trigger.cc

@@ -1,7 +1,7 @@
 #include "zeek/Trigger.h"
 
-#include <assert.h>
 #include <algorithm>
+#include <cassert>
 
 #include "zeek/DebugLogger.h"
 #include "zeek/Desc.h"

src/UID.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <string.h>
+#include <cstring>
 #include <string>
 
 #include "zeek/util.h" // for bro_int_t

src/Val.cc

@@ -6,12 +6,12 @@
 
 #include <netdb.h>
 #include <netinet/in.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <cmath>
+#include <cstdio>
+#include <cstdlib>
 #include <set>
 
 #include "zeek/Attr.h"

src/ZeekString.cc

@@ -4,8 +4,8 @@
 
 #include "zeek/zeek-config.h"
 
-#include <ctype.h>
 #include <algorithm>
+#include <cctype>
 #include <iostream>
 #include <sstream> // Needed for unit testing
 

src/analyzer/protocol/dce-rpc/DCE_RPC.cc

@@ -4,7 +4,7 @@
 
 #include "zeek/zeek-config.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <map>
 #include <string>
 

src/analyzer/protocol/dns/DNS.cc

@@ -5,10 +5,10 @@
 #include "zeek/zeek-config.h"
 
 #include <arpa/inet.h>
-#include <ctype.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <sys/types.h>
+#include <cctype>
 
 #include "zeek/Event.h"
 #include "zeek/NetVar.h"

src/analyzer/protocol/finger/Finger.cc

@@ -4,7 +4,7 @@
 
 #include "zeek/zeek-config.h"
 
-#include <ctype.h>
+#include <cctype>
 
 #include "zeek/Event.h"
 #include "zeek/NetVar.h"

src/analyzer/protocol/ftp/FTP.cc

@@ -4,7 +4,7 @@
 
 #include "zeek/zeek-config.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "zeek/Base64.h"
 #include "zeek/Event.h"

src/analyzer/protocol/gnutella/Gnutella.cc

@@ -4,8 +4,8 @@
 
 #include "zeek/zeek-config.h"
 
-#include <ctype.h>
 #include <algorithm>
+#include <cctype>
 
 #include "zeek/Event.h"
 #include "zeek/NetVar.h"

src/analyzer/protocol/http/HTTP.cc

@@ -4,10 +4,10 @@
 
 #include "zeek/zeek-config.h"
 
-#include <ctype.h>
-#include <math.h>
-#include <stdlib.h>
 #include <algorithm>
+#include <cctype>
+#include <cmath>
+#include <cstdlib>
 #include <string>
 
 #include "zeek/Event.h"

src/analyzer/protocol/ident/Ident.cc

@@ -4,7 +4,7 @@
 
 #include "zeek/zeek-config.h"
 
-#include <ctype.h>
+#include <cctype>
 
 #include "zeek/Event.h"
 #include "zeek/NetVar.h"

src/analyzer/protocol/login/Login.cc

@@ -4,8 +4,8 @@
 
 #include "zeek/zeek-config.h"
 
-#include <ctype.h>
+#include <cctype>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "zeek/Event.h"
 #include "zeek/NetVar.h"

src/analyzer/protocol/login/NVT.cc

@@ -4,7 +4,7 @@
 
 #include "zeek/zeek-config.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "zeek/Event.h"
 #include "zeek/NetVar.h"

src/analyzer/protocol/mime/MIME.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <assert.h>
 #include <openssl/evp.h>
-#include <stdio.h>
+#include <cassert>
+#include <cstdio>
 #include <queue>
 #include <vector>
 

src/analyzer/protocol/ncp/NCP.cc

@@ -4,7 +4,7 @@
 
 #include "zeek/zeek-config.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <map>
 #include <string>
 

src/analyzer/protocol/netbios/NetbiosSSN.cc

@@ -4,7 +4,7 @@
 
 #include "zeek/zeek-config.h"
 
-#include <ctype.h>
+#include <cctype>
 
 #include "zeek/Event.h"
 #include "zeek/NetVar.h"

src/analyzer/protocol/ntp/ntp-analyzer.pac

@@ -1,6 +1,6 @@
 
 %extern{
-	#include <math.h>
+	#include <cmath>
 	#define FRAC_16 pow(2,-16)
 	#define FRAC_32 pow(2,-32)
 	// NTP defines the epoch from 1900, not 1970

src/analyzer/protocol/pop3/POP3.cc

@@ -5,7 +5,7 @@
 
 #include "zeek/zeek-config.h"
 
-#include <ctype.h>
+#include <cctype>
 #include <string>
 #include <vector>
 

src/analyzer/protocol/rpc/RPC.cc

@@ -4,7 +4,7 @@
 
 #include "zeek/zeek-config.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <string>
 
 #include "zeek/NetVar.h"

src/analyzer/protocol/rpc/XDR.cc

@@ -4,8 +4,8 @@
 
 #include "zeek/zeek-config.h"
 
-#include <string.h>
 #include <algorithm>
+#include <cstring>
 
 #include "zeek/analyzer/protocol/rpc/events.bif.h"
 

src/analyzer/protocol/smtp/SMTP.cc

@@ -4,7 +4,7 @@
 
 #include "zeek/zeek-config.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "zeek/Event.h"
 #include "zeek/NetVar.h"

src/analyzer/protocol/tcp/TCP_Endpoint.cc

@@ -2,7 +2,7 @@
 
 #include "zeek/analyzer/protocol/tcp/TCP_Endpoint.h"
 
-#include <errno.h>
+#include <cerrno>
 
 #include "zeek/Event.h"
 #include "zeek/File.h"

src/binpac-lib.pac

@@ -1,5 +1,5 @@
 %extern{
-#include <string.h>
+#include <cstring>
 #include <binpac_bytestring.h>
 %}
 

src/fuzzers/FuzzBuffer.cc

@@ -4,7 +4,7 @@
 
 #include "zeek/fuzzers/FuzzBuffer.h"
 
-#include <string.h>
+#include <cstring>
 
 namespace zeek::detail
 	{

src/input/readers/ascii/Ascii.cc

@@ -2,10 +2,10 @@
 
 #include "zeek/input/readers/ascii/Ascii.h"
 
-#include <errno.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <cerrno>
 #include <sstream>
 
 #include "zeek/input/readers/ascii/ascii.bif.h"

src/input/readers/benchmark/Benchmark.cc

@@ -2,10 +2,10 @@
 
 #include "zeek/input/readers/benchmark/Benchmark.h"
 
-#include <errno.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <cerrno>
 
 #include "zeek/input/readers/benchmark/benchmark.bif.h"
 #include "zeek/threading/Manager.h"

src/input/readers/config/Config.cc

@@ -2,11 +2,11 @@
 
 #include "zeek/input/readers/config/Config.h"
 
-#include <errno.h>
 #include <regex.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <cerrno>
 #include <sstream>
 #include <unordered_set>
 

src/input/readers/raw/Raw.cc

@@ -2,15 +2,15 @@
 
 #include "zeek/input/readers/raw/Raw.h"
 
-#include <errno.h>
 #include <fcntl.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
+#include <cerrno>
+#include <csignal>
+#include <cstdio>
+#include <cstdlib>
 
 #include "zeek/input/readers/raw/Plugin.h"
 #include "zeek/input/readers/raw/raw.bif.h"

src/iosource/BPF_Program.cc

@@ -4,7 +4,7 @@
 
 #include "zeek/zeek-config.h"
 
-#include <string.h>
+#include <cstring>
 
 #include "zeek/util.h"
 

src/iosource/Manager.cc

@@ -2,7 +2,7 @@
 
 #include "zeek/iosource/Manager.h"
 
-#include <assert.h>
+#include <cassert>
 // These two files have to remain in the same order or FreeBSD builds
 // stop working.
 // clang-format off

src/iosource/Packet.h

@@ -2,8 +2,8 @@
 
 #include "zeek/zeek-config.h"
 
-#include <stdint.h>
 #include <sys/types.h> // for u_char
+#include <cstdint>
 #include <string>
 
 #if defined(__OpenBSD__)

src/iosource/pcap/Dumper.cc

@@ -2,8 +2,8 @@
 
 #include "zeek/iosource/pcap/Dumper.h"
 
-#include <errno.h>
 #include <sys/stat.h>
+#include <cerrno>
 
 #include "zeek/RunState.h"
 #include "zeek/iosource/PktSrc.h"

src/logging/writers/ascii/Ascii.cc

@@ -3,11 +3,11 @@
 #include "zeek/logging/writers/ascii/Ascii.h"
 
 #include <dirent.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <cerrno>
 #include <cstdio>
 #include <ctime>
 #include <memory>

src/logging/writers/sqlite/SQLite.cc

@@ -4,7 +4,7 @@
 
 #include "zeek/zeek-config.h"
 
-#include <errno.h>
+#include <cerrno>
 #include <string>
 #include <vector>
 

src/module_util.cc

@@ -3,7 +3,7 @@
 
 #include "zeek/module_util.h"
 
-#include <string.h>
+#include <cstring>
 #include <iostream>
 #include <string>
 

src/net_util.h

@@ -27,7 +27,7 @@ enum IPFamily
 // clang-format off
 #include <sys/types.h>
 #include <arpa/inet.h>
-#include <assert.h>
+#include <cassert>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>

src/parse.y

@@ -78,9 +78,9 @@
 %type <when_clause> when_head when_start when_clause
 
 %{
-#include <stdlib.h>
+#include <cstdlib>
-#include <string.h>
+#include <cstring>
-#include <assert.h>
+#include <cassert>
 
 #include <set>
 #include <string>

src/plugin/Manager.cc

@@ -4,10 +4,10 @@
 
 #include <dirent.h>
 #include <dlfcn.h>
-#include <errno.h>
 #include <glob.h>
-#include <limits.h> // for PATH_MAX
 #include <sys/stat.h>
+#include <cerrno>
+#include <climits> // for PATH_MAX
 #include <cstdlib>
 #include <fstream>
 #include <optional>

src/probabilistic/CardinalityCounter.cc

@@ -3,8 +3,8 @@
 #include "zeek/probabilistic/CardinalityCounter.h"
 
 #include <broker/data.hh>
-#include <math.h>
+#include <cmath>
-#include <stdint.h>
+#include <cstdint>
 #include <utility>
 
 #include "zeek/Reporter.h"

src/probabilistic/CardinalityCounter.h

@@ -3,7 +3,7 @@
 #pragma once
 
 #include <broker/expected.hh>
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 #include <vector>
 

src/re-parse.y

@@ -1,7 +1,7 @@
 // parse.y - parser for flex input
 
 %{
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "zeek/RE.h"
 #include "zeek/CCL.h"

src/rule-scan.l

@@ -1,5 +1,5 @@
 %{
-#include <string.h>
+#include <cstring>
 #include <string>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -247,4 +247,3 @@ void rules_parse_input()
 	rules_parse();
 	yy_delete_buffer(rules_buffer);
 	}
-

src/scan.l

@@ -1,8 +1,7 @@
 %{
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include <errno.h>
+#include <cerrno>
-
 #include <climits>
 #include <cstdlib>
 

src/script_opt/CPP/Driver.cc

@@ -1,8 +1,8 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include <errno.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <cerrno>
 
 #include "zeek/script_opt/CPP/Compile.h"
 

src/script_opt/CPP/Util.cc

@@ -2,9 +2,9 @@
 
 #include "zeek/script_opt/CPP/Util.h"
 
-#include <errno.h>
 #include <sys/file.h>
 #include <unistd.h>
+#include <cerrno>
 
 #include "zeek/script_opt/StmtOptInfo.h"
 

src/session/Manager.cc

@@ -7,8 +7,8 @@
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <pcap.h>
-#include <stdlib.h>
 #include <unistd.h>
+#include <cstdlib>
 
 #include "zeek/Desc.h"
 #include "zeek/Event.h"

src/threading/BasicThread.cc

@@ -3,7 +3,7 @@
 #include "zeek/zeek-config.h"
 
 #include <pthread.h>
-#include <signal.h>
+#include <csignal>
 
 #include "zeek/threading/Manager.h"
 #include "zeek/util.h"

src/threading/BasicThread.h

@@ -3,8 +3,8 @@
 
 #include "zeek/zeek-config.h"
 
-#include <stdint.h>
 #include <atomic>
+#include <cstdint>
 #include <iosfwd>
 #include <thread>
 

src/threading/Formatter.cc

@@ -4,7 +4,7 @@
 
 #include "zeek/zeek-config.h"
 
-#include <errno.h>
+#include <cerrno>
 
 #include "zeek/3rdparty/bro_inet_ntop.h"
 #include "zeek/threading/MsgThread.h"

src/threading/MsgThread.cc

@@ -1,8 +1,8 @@
 #include "zeek/threading/MsgThread.h"
 
 #include <fcntl.h>
-#include <signal.h>
 #include <unistd.h>
+#include <csignal>
 
 #include "zeek/DebugLogger.h"
 #include "zeek/Desc.h"

src/threading/Queue.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <stdint.h>
 #include <sys/time.h>
 #include <condition_variable>
+#include <cstdint>
 #include <deque>
 #include <mutex>
 #include <queue>

src/threading/formatters/Ascii.cc

@@ -4,7 +4,7 @@
 
 #include "zeek/zeek-config.h"
 
-#include <errno.h>
+#include <cerrno>
 #include <sstream>
 
 #include "zeek/Desc.h"

src/threading/formatters/JSON.cc

@@ -8,10 +8,10 @@
 #define __STDC_LIMIT_MACROS
 #endif
 
-#include <errno.h>
-#include <math.h>
 #include <rapidjson/internal/ieee754.h>
-#include <stdint.h>
+#include <cerrno>
+#include <cmath>
+#include <cstdint>
 #include <sstream>
 
 #include "zeek/Desc.h"

src/util.cc

@@ -11,20 +11,20 @@
 #include <mach/task.h>
 #endif
 
-#include <ctype.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <libgen.h>
 #include <openssl/md5.h>
 #include <openssl/sha.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <cctype>
+#include <cerrno>
+#include <csignal>
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
 
 #if defined(HAVE_MALLINFO) || defined(HAVE_MALLINFO2)
 #include <malloc.h>

src/util.h

@@ -15,13 +15,13 @@
 #endif
 
 #include <libgen.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <array>
 #include <cinttypes>
+#include <cstdarg>
 #include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <memory> // std::unique_ptr
 #include <string>
 #include <string_view>
@@ -29,18 +29,18 @@
 
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
-#include <time.h>
+#include <ctime>
 #else
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #else
-#include <time.h>
+#include <ctime>
 #endif
 #endif
 
 #ifdef DEBUG
 
-#include <assert.h>
+#include <cassert>
 
 #define ASSERT(x) assert(x)
 #define DEBUG_MSG(x...) fprintf(stderr, x)

src/zeek-setup.cc

@@ -7,12 +7,12 @@
 #include <openssl/err.h>
 #include <openssl/opensslv.h>
 #include <openssl/ssl.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <csignal>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <list>
 #include <optional>
 

src/zeek.bif

@@ -8,13 +8,13 @@
 ##! in this file.
 
 %%{ // C segment
-#include <math.h>
+#include <cmath>
 #include <vector>
 #include <algorithm>
 #include <cmath>
 #include <sys/stat.h>
 #include <cstdio>
-#include <time.h>
+#include <ctime>
 
 #include "zeek/digest.h"
 #include "zeek/Reporter.h"

src/zeekygen/Configuration.cc

@@ -2,8 +2,8 @@
 
 #include "zeek/zeekygen/Configuration.h"
 
-#include <errno.h>
 #include <algorithm>
+#include <cerrno>
 #include <fstream>
 #include <vector>
 

src/zeekygen/Manager.h

@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include <errno.h>
 #include <sys/stat.h>
+#include <cerrno>
 #include <ctime>
 #include <map>
 #include <string>

src/zeekygen/PackageInfo.cc

@@ -2,7 +2,7 @@
 
 #include "zeek/zeekygen/PackageInfo.h"
 
-#include <errno.h>
+#include <cerrno>
 #include <fstream>
 
 #include "zeek/Reporter.h"

src/zeekygen/ReStructuredTextTable.cc

@@ -2,7 +2,7 @@
 
 #include "zeek/zeekygen/ReStructuredTextTable.h"
 
-#include <assert.h>
+#include <cassert>
 
 using namespace std;