From 609e778fc21d3687a3d7ab81aca1b20f1f24a3bc Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Tue, 12 Feb 2013 16:24:53 -0800 Subject: [PATCH] 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 --- build-aux/extract-ofp-errors | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) 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 -- 2.47.0