Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/tools/make-regs.py b/tools/make-regs.py
index 376b3c65..f17a3f4a 100755
--- a/tools/make-regs.py
+++ b/tools/make-regs.py
@@ -64,11 +64,11 @@ const unsigned long dissector_reg_handoff_count = {1};
 
     output += gen_prototypes(protos)
     output += "\n"
-    output += gen_array(protos, "dissector_reg_t dissector_reg_proto")
+    output += gen_array(protos, "dissector_reg_t const dissector_reg_proto")
     output += "\n"
     output += gen_prototypes(handoffs)
     output += "\n"
-    output += gen_array(handoffs, "dissector_reg_t dissector_reg_handoff")
+    output += gen_array(handoffs, "dissector_reg_t const dissector_reg_handoff")
 
     with open(outfile, "w") as f:
         f.write(output)
@@ -96,7 +96,7 @@ const unsigned wtap_module_count = {0};
 
     output += gen_prototypes(wtap_modules)
     output += "\n"
-    output += gen_array(wtap_modules, "wtap_module_reg_t wtap_module_reg")
+    output += gen_array(wtap_modules, "wtap_module_reg_t const wtap_module_reg")
 
     with open(outfile, "w") as f:
         f.write(output)
@@ -124,7 +124,7 @@ const unsigned long tap_reg_listener_count = {0};
 
     output += gen_prototypes(taps)
     output += "\n"
-    output += gen_array(taps, "tap_reg_t tap_reg_listener")
+    output += gen_array(taps, "tap_reg_t const tap_reg_listener")
 
     with open(outfile, "w") as f:
         f.write(output)
@@ -143,7 +143,7 @@ if __name__ == "__main__":
     outfile = sys.argv[2]
     if sys.argv[3].startswith("@"):
         with open(sys.argv[3][1:]) as f:
-            infiles = [l.strip() for l in f.readlines()]
+            infiles = [line.strip() for line in f.readlines()]
     else:
         infiles = sys.argv[3:]