diff --git a/tools/make-dissector-reg.py b/tools/make-dissector-reg.py index 4497290..7eff0ba 100755 --- a/tools/make-dissector-reg.py +++ b/tools/make-dissector-reg.py @@ -59,7 +59,7 @@ */ """ else: - print "Unknown output type '%s'" % registertype + print( "Unknown output type '%s'" % registertype) sys.exit(1) @@ -77,7 +77,7 @@ filenames.append(os.path.join(srcdir, file)) if len(filenames) < 1: - print "No files found" + print( "No files found") sys.exit(1) @@ -130,7 +130,7 @@ if cache and cache.has_key(filename): cdict = cache[filename] if cur_mtime == cdict['mtime']: -# print "Pulling %s from cache" % (filename) +# print( "Pulling %s from cache" % (filename)) regs['proto_reg'].extend(cdict['proto_reg']) regs['handoff_reg'].extend(cdict['handoff_reg']) regs['wtap_register'].extend(cdict['wtap_register']) @@ -144,7 +144,7 @@ 'handoff_reg': [], 'wtap_register': [], } -# print "Searching %s" % (filename) +# print( "Searching %s" % (filename)) for line in file.readlines(): for action in patterns: regex = action[1] @@ -154,7 +154,7 @@ sym_type = action[0] regs[sym_type].append(symbol) if cache is not None: -# print "Caching %s for %s: %s" % (sym_type, filename, symbol) +# print( "Caching %s for %s: %s" % (sym_type, filename, symbol)) cache[filename][sym_type].append(symbol) file.close() @@ -165,7 +165,7 @@ # Make sure we actually processed something if len(regs['proto_reg']) < 1: - print "No protocol registrations found" + print( "No protocol registrations found") sys.exit(1) # Sort the lists to make them pretty @@ -246,22 +246,18 @@ register_wtap_module(void) { """); - for symbol in regs['wtap_register']: line = " {extern void %s (void); %s ();}\n" % (symbol, symbol) reg_code.write(line) - reg_code.write("}\n"); - reg_code.write("#endif\n"); + reg_code.write("#endif\n"); else: reg_code.write(""" static gulong proto_reg_count(void) { """); - line = " return %d;\n" % len(regs['proto_reg']) reg_code.write(line) - reg_code.write(""" } """);