Split register_count() into proto_reg_count() and handoff_reg_count()

svn path=/trunk/; revision=30447

1 files changed, 24 insertions, 2 deletions

diff --git a/tools/make-dissector-reg.py b/tools/make-dissector-reg.py
index b7ae0c26b8..9b9f250503 100755
--- a/tools/make-dissector-reg.py
+++ b/tools/make-dissector-reg.py
@@ -255,16 +255,38 @@ register_wtap_module(void)
         reg_code.write("#endif\n");
 else:
 	reg_code.write("""
-gulong register_count(void)
+static gulong proto_reg_count(void)
+{
+""");
+
+	line = "  return %d;\n" % len(regs['proto_reg'])
+	reg_code.write(line)
+
+	reg_code.write("""
+}
+""");
+	reg_code.write("""
+static gulong handoff_reg_count(void)
 {
 """);
 
-	line = "  return %d + %d;\n" % (len(regs['proto_reg']), len(regs['handoff_reg']))
+	line = "  return %d;\n" % len(regs['handoff_reg'])
 	reg_code.write(line)
 
 	reg_code.write("""
 }
 """);
+	reg_code.write("""
+gulong register_count(void)
+{
+""");
+
+	line = "  return proto_reg_count() + handoff_reg_count();"
+	reg_code.write(line)
+
+	reg_code.write("""
+}\n
+""");
 
 
 # Close the file