More checking ett entries are registered

crondaemon · Nov 28, 2024 · ca8c208 · ca8c208
1 parent 5459d6a
commit ca8c208
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/epan/dissectors/packet-thread.c b/epan/dissectors/packet-thread.c
@@ -3473,6 +3473,9 @@ proto_register_thread_nm(void)
         static int *ett[] = {
             &ett_thread_nm,
             &ett_thread_nm_tlv,
+            /* These need to be registered somewhere.. */
+            &ett_thread,
+            &ett_thread_ie_fields
         };
 
         static ei_register_info ei[] = {

diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c
@@ -7478,7 +7478,7 @@ proto_register_usb(void)
         },
     };
 
-    static int *usb_subtrees[] = {
+    static int *usb_ett[] = {
         &ett_usb_hdr,
         &ett_usb_setup_hdr,
         &ett_usb_isodesc,
@@ -7537,7 +7537,7 @@ proto_register_usb(void)
 
     proto_register_field_array(proto_usb, hf, array_length(hf));
     proto_register_field_array(proto_usbport, hf_usbport, array_length(hf_usbport));
-    proto_register_subtree_array(usb_subtrees, array_length(usb_subtrees));
+    proto_register_subtree_array(usb_ett, array_length(usb_ett));
     proto_register_subtree_array(usbport_ett, array_length(usbport_ett));
 
     expert_usb = expert_register_protocol(proto_usb);

diff --git a/tools/check_typed_item_calls.py b/tools/check_typed_item_calls.py
@@ -2039,9 +2039,9 @@ def checkFile(filename, check_mask=False, mask_exact_width=False, check_label=Fa
         ett_defined =  findDefinedTrees(filename, ett_declared)
         for d in ett_declared:
             if d not in ett_defined:
-                global errors_found
-                print(filename, 'subtree identifier', d, 'is declared but not found in an array for registering')
-                errors_found += 1
+                global warnings_found
+                print('Warning:', filename, 'subtree identifier', d, 'is declared but not found in an array for registering')
+                warnings_found += 1
 
     items_declared = {}
     if check_missing_items: