From 034db92a2119250c6f278b55f2f223ea1ace9d1a Mon Sep 17 00:00:00 2001
From: Luke Mewburn <luke () mewburn net>
Date: Fri, 1 May 2020 11:22:03 +1000
Subject: [PATCH] idl2wrs: generation improvements

Consistent user exception ordering.
Fix switch msgtype default indenting.

Change-Id: Id345013d558bb458f5476b3225dc91a0b6afeb42
---
 tools/wireshark_gen.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/wireshark_gen.py b/tools/wireshark_gen.py
index f58470f1f6..f28f7edffe 100755
--- a/tools/wireshark_gen.py
+++ b/tools/wireshark_gen.py
@@ -54,6 +54,7 @@
 
 from __future__ import print_function
 
+import collections
 import tempfile
 
 from omniidl import idlast, idltype, idlutil, output
@@ -1747,7 +1748,7 @@ class wireshark_gen_C:
         to generate dissect_exception_XXX functions.
         """
 
-        ex_hash = {}  # holds a hash of unique exceptions.
+        ex_hash = collections.OrderedDict()  # holds a hash of unique exceptions.
         for op in oplist:
             for ex in op.raises():
                 if ex not in ex_hash:
@@ -1945,7 +1946,7 @@ default:
     expert_add_info_format(pinfo, item, &ei_@dissector_name@_unknown_giop_msg, "Unknown GIOP message %d", header->message_type);"""
 
     template_helper_switch_msgtype_default_end = """\
-break;"""
+    break;"""
 
     template_helper_switch_msgtype_end = """\
 } /* switch(header->message_type) */"""
-- 
2.24.2 (Apple Git-127)