Merge remote-tracking branch 'origin/topic/timw/remove-unneeded-binpac-includes'

* origin/topic/timw/remove-unneeded-binpac-includes:
  Remove some unnecessary #includes from binpac source files

CHANGES

@@ -1,3 +1,7 @@
+8.1.0-dev.492 | 2025-09-02 16:00:17 -0700
+
+  * Remove some unnecessary #includes from binpac source files (Tim Wojtulewicz, Corelight)
+
 8.1.0-dev.490 | 2025-09-02 11:47:44 -0700
 
   * Fix a few more random clang-tidy findings (Tim Wojtulewicz, Corelight)

VERSION

@@ -1 +1 @@
-8.1.0-dev.490
+8.1.0-dev.492

tools/binpac/lib/binpac_buffer.cc

@@ -1,6 +1,5 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include <cstdio>
 #include <cstdlib>
 #include <cstring> // for memcpy
 

tools/binpac/src/pac_analyzer.cc

@@ -14,7 +14,6 @@
 #include "pac_paramtype.h"
 #include "pac_state.h"
 #include "pac_type.h"
-#include "pac_varfield.h"
 
 AnalyzerDecl::AnalyzerDecl(ID* id, DeclType decl_type, ParamList* params) : TypeDecl(id, params, new DummyType()) {
     decl_type_ = decl_type;

tools/binpac/src/pac_array.cc

@@ -8,7 +8,6 @@
 #include "pac_expr.h"
 #include "pac_exttype.h"
 #include "pac_id.h"
-#include "pac_number.h"
 #include "pac_output.h"
 #include "pac_utils.h"
 #include "pac_varfield.h"

tools/binpac/src/pac_cclass.h

@@ -3,15 +3,18 @@
 #ifndef pac_cclass_h
 #define pac_cclass_h
 
+#include <string>
+#include <vector>
+
 class CClass;
 class CClassMember;
 class CClassMethod;
 class CType;
 class CVariable;
 
-typedef vector<CClassMember*> CClassMemberList;
+using CClassMemberList = std::vector<CClassMember*>;
-typedef vector<CClassMethod*> CClassMethodList;
+using CClassMethodList = std::vector<CClassMethod*>;
-typedef vector<CVariable*> CVariableList;
+using CVariableList = std::vector<CVariable*>;
 
 #include "pac_common.h"
 
@@ -44,7 +47,7 @@ protected:
 
 class CVariable {
 public:
-    CClassMember(const string& name, CType* type);
+    CVariable(const std::string& name, CType* type);
 
     string name() const { return name_; }
     CType* type() const { return type_; }

tools/binpac/src/pac_conn.cc

@@ -4,9 +4,7 @@
 
 #include "pac_analyzer.h"
 #include "pac_dataunit.h"
-#include "pac_embedded.h"
 #include "pac_exception.h"
-#include "pac_expr.h"
 #include "pac_flow.h"
 #include "pac_output.h"
 #include "pac_paramtype.h"

tools/binpac/src/pac_conn.h

@@ -4,7 +4,6 @@
 #define pac_conn_h
 
 #include "pac_analyzer.h"
-#include "pac_decl.h"
 
 class ConnDecl : public AnalyzerDecl {
 public:

tools/binpac/src/pac_context.cc

@@ -4,7 +4,6 @@
 
 #include "pac_analyzer.h"
 #include "pac_exception.h"
-#include "pac_exttype.h"
 #include "pac_flow.h"
 #include "pac_id.h"
 #include "pac_output.h"

tools/binpac/src/pac_dbg.h

@@ -3,8 +3,8 @@
 #ifndef pac_dbg_h
 #define pac_dbg_h
 
-#include <assert.h>
+#include <cassert>
-#include <stdio.h>
+#include <cstdio>
 
 extern bool FLAGS_pac_debug;
 

tools/binpac/src/pac_decl.cc

@@ -4,16 +4,10 @@
 
 #include "pac_attr.h"
 #include "pac_context.h"
-#include "pac_dataptr.h"
 #include "pac_embedded.h"
 #include "pac_exception.h"
-#include "pac_expr.h"
-#include "pac_exttype.h"
 #include "pac_id.h"
 #include "pac_output.h"
-#include "pac_param.h"
-#include "pac_record.h"
-#include "pac_type.h"
 #include "pac_utils.h"
 
 DeclList* Decl::decl_list_ = nullptr;

tools/binpac/src/pac_expr.cc

@@ -7,12 +7,12 @@
 #include "pac_exception.h"
 #include "pac_exttype.h"
 #include "pac_id.h"
+#include "pac_let.h"
 #include "pac_nullptr.h"
 #include "pac_number.h"
 #include "pac_output.h"
 #include "pac_record.h"
 #include "pac_regex.h"
-#include "pac_strtype.h"
 #include "pac_typedecl.h"
 #include "pac_utils.h"
 

tools/binpac/src/pac_exttype.cc

@@ -2,7 +2,6 @@
 
 #include "pac_exttype.h"
 
-#include "pac_decl.h"
 #include "pac_id.h"
 #include "pac_output.h"
 

tools/binpac/src/pac_flow.cc

@@ -7,7 +7,6 @@
 #include "pac_context.h"
 #include "pac_dataptr.h"
 #include "pac_dataunit.h"
-#include "pac_embedded.h"
 #include "pac_exception.h"
 #include "pac_expr.h"
 #include "pac_exttype.h"

tools/binpac/src/pac_inputbuf.cc

@@ -6,7 +6,6 @@
 #include "pac_exttype.h"
 #include "pac_id.h"
 #include "pac_output.h"
-#include "pac_type.h"
 
 InputBuffer::InputBuffer(Expr* expr) : DataDepElement(INPUT_BUFFER), expr_(expr) {}
 

tools/binpac/src/pac_main.cc

@@ -6,7 +6,6 @@
 #include "pac_common.h"
 #include "pac_decl.h"
 #include "pac_exception.h"
-#include "pac_exttype.h"
 #include "pac_id.h"
 #include "pac_output.h"
 // NOLINTBEGIN

tools/binpac/src/pac_output.cc

@@ -7,11 +7,7 @@
 #include <cstdio>
 #include <cstring>
 
-#include "pac_utils.h"
+OutputException::OutputException(const char* arg_msg) : msg(arg_msg) {}
-
-OutputException::OutputException(const char* arg_msg) { msg = arg_msg; }
-
-OutputException::~OutputException() {}
 
 Output::Output(string filename) {
     fp = fopen(filename.c_str(), "w");

tools/binpac/src/pac_output.h

@@ -3,8 +3,8 @@
 #ifndef pac_output_h
 #define pac_output_h
 
-#include <stdarg.h>
+#include <cstdarg>
-#include <stdio.h>
+#include <cstdio>
 #include <string>
 
 using namespace std;
@@ -12,7 +12,7 @@ using namespace std;
 class OutputException {
 public:
     OutputException(const char* arg_msg);
-    ~OutputException();
+    ~OutputException() = default;
     const char* errmsg() const { return msg.c_str(); }
 
 protected:

tools/binpac/src/pac_param.cc

@@ -2,7 +2,6 @@
 
 #include "pac_param.h"
 
-#include "pac_decl.h"
 #include "pac_exttype.h"
 #include "pac_field.h"
 #include "pac_id.h"

tools/binpac/src/pac_paramtype.cc

@@ -2,7 +2,6 @@
 
 #include "pac_paramtype.h"
 
-#include "pac_context.h"
 #include "pac_dataptr.h"
 #include "pac_exception.h"
 #include "pac_expr.h"

tools/binpac/src/pac_record.cc

@@ -2,7 +2,6 @@
 
 #include "pac_record.h"
 
-#include "pac_attr.h"
 #include "pac_dataptr.h"
 #include "pac_exception.h"
 #include "pac_expr.h"
@@ -12,7 +11,6 @@
 #include "pac_type.h"
 #include "pac_typedecl.h"
 #include "pac_utils.h"
-#include "pac_varfield.h"
 
 RecordType::RecordType(RecordFieldList* record_fields) : Type(RECORD) {
     // Here we assume that the type is a standalone type.

tools/binpac/src/pac_record.h

@@ -6,7 +6,6 @@
 #include "pac_common.h"
 #include "pac_field.h"
 #include "pac_id.h"
-#include "pac_let.h"
 #include "pac_type.h"
 
 class RecordType : public Type {

tools/binpac/src/pac_redef.cc

@@ -7,7 +7,6 @@
 #include "pac_exception.h"
 #include "pac_expr.h"
 #include "pac_func.h"
-#include "pac_record.h"
 #include "pac_type.h"
 #include "pac_typedecl.h"
 

tools/binpac/src/pac_regex.cc

@@ -5,7 +5,6 @@
 #include "pac_exttype.h"
 #include "pac_id.h"
 #include "pac_output.h"
-#include "pac_type.h"
 
 // Depends on the regular expression library we are using
 const char* RegEx::kREMatcherType = "RegExMatcher";

tools/binpac/src/pac_type.cc

@@ -2,13 +2,10 @@
 
 #include "pac_type.h"
 
-#include "pac_action.h"
 #include "pac_array.h"
 #include "pac_attr.h"
 #include "pac_btype.h"
-#include "pac_context.h"
 #include "pac_dataptr.h"
-#include "pac_decl.h"
 #include "pac_exception.h"
 #include "pac_expr.h"
 #include "pac_exttype.h"
@@ -18,6 +15,7 @@
 #include "pac_output.h"
 #include "pac_paramtype.h"
 #include "pac_strtype.h"
+#include "pac_typedecl.h"
 #include "pac_utils.h"
 #include "pac_varfield.h"
 #include "pac_withinput.h"

tools/binpac/src/pac_typedecl.cc

@@ -5,16 +5,15 @@
 #include "pac_attr.h"
 #include "pac_context.h"
 #include "pac_dataptr.h"
-#include "pac_embedded.h"
 #include "pac_enum.h"
 #include "pac_exception.h"
 #include "pac_expr.h"
 #include "pac_exttype.h"
 #include "pac_id.h"
+#include "pac_let.h"
 #include "pac_output.h"
 #include "pac_param.h"
 #include "pac_paramtype.h"
-#include "pac_record.h"
 #include "pac_type.h"
 #include "pac_utils.h"
 

tools/binpac/src/pac_varfield.cc

@@ -1,5 +0,0 @@
-// See the file "COPYING" in the main distribution directory for copyright.
-
-#include "pac_varfield.h"
-
-void PrivVarField::Prepare(Env* env) { Field::Prepare(env); }

tools/binpac/src/pac_varfield.h

@@ -18,7 +18,7 @@ class PubVarField : public Field {
 public:
     PubVarField(ID* id, Type* type)
         : Field(PUB_VAR_FIELD, TYPE_NOT_TO_BE_PARSED | CLASS_MEMBER | PUBLIC_READABLE, id, type) {}
-    ~PubVarField() override {}
+    ~PubVarField() override = default;
 };
 
 // A private variable
@@ -26,7 +26,7 @@ class PrivVarField : public Field {
 public:
     PrivVarField(ID* id, Type* type)
         : Field(PRIV_VAR_FIELD, TYPE_NOT_TO_BE_PARSED | CLASS_MEMBER | NOT_PUBLIC_READABLE, id, type) {}
-    ~PrivVarField() override {}
+    ~PrivVarField() override = default;
 
     void GenPubDecls(Output* out, Env* env) override { /* do nothing */ }
 };
@@ -34,7 +34,7 @@ public:
 class TempVarField : public Field {
 public:
     TempVarField(ID* id, Type* type) : Field(TEMP_VAR_FIELD, TYPE_NOT_TO_BE_PARSED | NOT_CLASS_MEMBER, id, type) {}
-    ~TempVarField() override {}
+    ~TempVarField() override = default;
 };
 
 #endif // pac_varfield_h

tools/binpac/src/pac_withinput.cc

@@ -2,8 +2,6 @@
 
 #include "pac_withinput.h"
 
-#include "pac_dataptr.h"
-#include "pac_expr.h"
 #include "pac_inputbuf.h"
 #include "pac_output.h"
 #include "pac_type.h"