X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=build-aux%2Fextract-ofp-errors;h=db28af839cd042124d23e0afbbd6480fb18c21ae;hb=885b000fab2673744004b66eddd4569e2f1f9c2e;hp=1ec5ba4d39ce654372e13fe15a3d220bfa703f41;hpb=d01c980ffe0d61497298a9f907ff93fe1751e2bd;p=openvswitch

diff --git a/build-aux/extract-ofp-errors b/build-aux/extract-ofp-errors
index 1ec5ba4d..db28af83 100755
--- a/build-aux/extract-ofp-errors
+++ b/build-aux/extract-ofp-errors
@@ -207,7 +207,7 @@ def extract_ofp_errors(filenames):
 
             enum = m.group(1)
 
-            comments.append(comment)
+            comments.append(re.sub('\[[^]]*\]', '', comment))
             names.append(enum)
 
             for dst in dsts.split(', '):
@@ -238,6 +238,11 @@ def extract_ofp_errors(filenames):
                               "NX1.2":  ("OF1.2",)}
                 if targets not in target_map:
                     fatal("%s: unknown error domain" % targets)
+                if targets.startswith('NX') and code < 0x100:
+                    fatal("%s: NX domain code cannot be less than 0x100" % dst)
+                if targets.startswith('OF') and code >= 0x100:
+                    fatal("%s: OF domain code cannot be greater than 0x100"
+                          % dst)
                 for target in target_map[targets]:
                     domain[target].setdefault(type_, {})
                     if code in domain[target][type_]:
@@ -343,7 +348,7 @@ static enum ofperr
 }"""
 
         print """
-const struct ofperr_domain %s = {
+static const struct ofperr_domain %s = {
     "%s",
     %d,
     %s_decode,