Use modern names for standard headers

src/DebugLogger.h

@@ -9,7 +9,7 @@
 
 #include "zeek/zeek-config.h"
 
-#include <stdio.h>
+#include <cstdio>
 #include <set>
 #include <string>
 

src/EquivClass.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <stdio.h>
+#include <cstdio>
 
 namespace zeek::detail {
 

src/List.h

@@ -21,11 +21,10 @@
 //	Entries must be either a pointer to the data or nonzero data with
 //	sizeof(data) <= sizeof(void*).
 
-#include <stdarg.h>
 #include <cassert>
+#include <cstdarg>
 #include <initializer_list>
 #include <iterator>
-#include <utility>
 
 #include "zeek/util.h"
 

src/Reporter.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <stdarg.h>
+#include <cstdarg>
 #include <list>
 #include <map>
 #include <string>

src/iosource/pcap/Source.cc

@@ -10,7 +10,7 @@
 #include <pcap-int.h>
 #endif
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "zeek/Event.h"
 #include "zeek/iosource/BPF_Program.h"

src/re-scan.l

@@ -5,11 +5,11 @@
  */
 
 %top{
-// Include stdint.h at the start of the generated file. Typically
+// Include cstdint at the start of the generated file. Typically
 // MSVC will include this header later, after the definitions of
 // the integral type macros. MSVC then complains that about the
-// redefinition of the types. Including stdint.h early avoids this.
-#include <stdint.h>
+// redefinition of the types. Including cstdint early avoids this.
+#include <cstdint>
 }
 
 %{

src/rule-parse.y

@@ -1,6 +1,6 @@
 %{
 #include "zeek/zeek-config.h"
-#include <stdio.h>
+#include <cstdio>
 #include <netinet/in.h>
 #include <vector>
 

src/rule-scan.l

@@ -1,9 +1,9 @@
 %top{
-// Include stdint.h at the start of the generated file. Typically
+// Include cstdint at the start of the generated file. Typically
 // MSVC will include this header later, after the definitions of
 // the integral type macros. MSVC then complains that about the
-// redefinition of the types. Including stdint.h early avoids this.
-#include <stdint.h>
+// redefinition of the types. Including cstdint early avoids this.
+#include <cstdint>
 }
 
 %{

src/scan.l

@@ -1,9 +1,9 @@
 %top{
-// Include stdint.h at the start of the generated file. Typically
+// Include cstdint at the start of the generated file. Typically
 // MSVC will include this header later, after the definitions of
 // the integral type macros. MSVC then complains that about the
-// redefinition of the types. Including stdint.h early avoids this.
-#include <stdint.h>
+// redefinition of the types. Including cstdint early avoids this.
+#include <cstdint>
 }
 
 %{

src/telemetry/ProcessStats.cc

@@ -9,10 +9,10 @@
 #include <libproc.h>
 #include <mach/mach.h>
 #include <mach/task.h>
-#include <math.h>
-#include <stdlib.h>
 #include <sys/resource.h>
 #include <unistd.h>
+#include <cmath>
+#include <cstdlib>
 
 namespace zeek::telemetry::detail {
 

src/util.h

@@ -63,8 +63,6 @@
 extern HeapLeakChecker* heap_checker;
 #endif
 
-#include <stdint.h>
-
 extern "C" {
 #include "zeek/3rdparty/modp_numtoa.h"
 }

src/zeekygen/Configuration.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <time.h> // for time_t
+#include <ctime> // for time_t
 #include <string>
 #include <vector>
 

src/zeekygen/IdentifierInfo.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <time.h> // for time_t
+#include <ctime> // for time_t
 #include <list>
 #include <map>
 #include <string>

src/zeekygen/PackageInfo.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <time.h> // for time_t
+#include <ctime> // for time_t
 #include <string>
 #include <vector>
 

src/zeekygen/ScriptInfo.h

@@ -4,7 +4,7 @@
 
 #include "zeek/zeek-config.h"
 
-#include <time.h> // for time_t
+#include <ctime> // for time_t
 #include <list>
 #include <map>
 #include <set>

src/zeekygen/SpicyModuleInfo.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <time.h> // for time_t
+#include <ctime> // for time_t
 #include <list>
 #include <string>
 #include <vector>

src/zeekygen/utils.h

@@ -4,7 +4,7 @@
 
 #include "zeek/zeek-config.h"
 
-#include <time.h> // for time_t
+#include <ctime> // for time_t
 #include <optional>
 #include <string>