From: Ben Pfaff <blp@nicira.com>
Date: Wed, 13 Feb 2013 00:24:53 +0000 (-0800)
Subject: extract-ofp-errors: Remove support for hexadecimal error types.
X-Git-Tag: sliver-openvswitch-1.10.90-3~6^2~124
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=609e778fc21d3687a3d7ab81aca1b20f1f24a3bc;p=sliver-openvswitch.git

extract-ofp-errors: Remove support for hexadecimal error types.

This feature wasn't used and removing it slightly simplifies the code.

Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/build-aux/extract-ofp-errors b/build-aux/extract-ofp-errors
index 965e322c4..32d0913c4 100755
--- a/build-aux/extract-ofp-errors
+++ b/build-aux/extract-ofp-errors
@@ -212,17 +212,13 @@ def extract_ofp_errors(filenames):
             names.append(enum)
 
             for dst in dsts.split(', '):
-                m = re.match(r'([A-Z0-9.+]+)\((\d+|(0x)[0-9a-fA-F]+)(?:,(\d+))?\)$', dst)
+                m = re.match(r'([A-Z0-9.+]+)\((\d+)(?:,(\d+))?\)$', dst)
                 if not m:
                     fatal("%s: syntax error in destination" % dst)
                 targets = m.group(1)
+                type_ = int(m.group(2))
                 if m.group(3):
-                    base = 16
-                else:
-                    base = 10
-                type_ = int(m.group(2), base)
-                if m.group(4):
-                    code = int(m.group(4))
+                    code = int(m.group(3))
                 else:
                     code = None