treewide: Fix ENUM_VALUE_PREFIX rule exception
Change-Id: Ibc2fd66711f6aa347e88e2379c12db1898373700
Reviewed-on: https://review.monogon.dev/c/monogon/+/3804
Tested-by: Jenkins CI
Reviewed-by: Leopold Schabel <leo@monogon.tech>
diff --git a/osbase/kmod/meta.go b/osbase/kmod/meta.go
index c005a7c..1c96c46 100644
--- a/osbase/kmod/meta.go
+++ b/osbase/kmod/meta.go
@@ -17,7 +17,7 @@
modInfoMap := make(map[string]ModuleInfo)
var meta kmodpb.Meta
meta.ModuleDeviceMatches = &kmodpb.RadixNode{
- Type: kmodpb.RadixNode_ROOT,
+ Type: kmodpb.RadixNode_TYPE_ROOT,
}
var i uint32
for _, m := range modinfos {
diff --git a/osbase/kmod/radix.go b/osbase/kmod/radix.go
index c20b48d..1631d87 100644
--- a/osbase/kmod/radix.go
+++ b/osbase/kmod/radix.go
@@ -25,23 +25,23 @@
func lookupModulesRec(n *kmodpb.RadixNode, needle string, matches map[uint32]bool) {
for _, c := range n.Children {
switch c.Type {
- case kmodpb.RadixNode_LITERAL:
+ case kmodpb.RadixNode_TYPE_LITERAL:
if len(needle) < len(c.Literal) {
continue
}
if c.Literal == needle[:len(c.Literal)] {
lookupModulesRec(c, needle[len(c.Literal):], matches)
}
- case kmodpb.RadixNode_WILDCARD:
+ case kmodpb.RadixNode_TYPE_WILDCARD:
for i := 0; i <= len(needle); i++ {
lookupModulesRec(c, needle[i:], matches)
}
- case kmodpb.RadixNode_SINGLE_WILDCARD:
+ case kmodpb.RadixNode_TYPE_SINGLE_WILDCARD:
if len(needle) < 1 {
continue
}
lookupModulesRec(c, needle[1:], matches)
- case kmodpb.RadixNode_BYTE_RANGE:
+ case kmodpb.RadixNode_TYPE_BYTE_RANGE:
if len(needle) < 1 {
continue
}
@@ -93,7 +93,7 @@
continue
}
switch c.Type {
- case kmodpb.RadixNode_LITERAL:
+ case kmodpb.RadixNode_TYPE_LITERAL:
if c.Literal[0] == currPart.Literal[0] {
var i int
for i < len(c.Literal) && i < len(currPart.Literal) && c.Literal[i] == currPart.Literal[i] {
@@ -107,11 +107,11 @@
return addPatternRec(c, parts[1:], nil)
}
if i == len(c.Literal) {
- return addPatternRec(c, parts, &kmodpb.RadixNode{Type: kmodpb.RadixNode_LITERAL, Literal: currPart.Literal[i:], ModuleIndex: currPart.ModuleIndex})
+ return addPatternRec(c, parts, &kmodpb.RadixNode{Type: kmodpb.RadixNode_TYPE_LITERAL, Literal: currPart.Literal[i:], ModuleIndex: currPart.ModuleIndex})
}
// Split current node
splitOldPart := &kmodpb.RadixNode{
- Type: kmodpb.RadixNode_LITERAL,
+ Type: kmodpb.RadixNode_TYPE_LITERAL,
Literal: c.Literal[i:],
Children: c.Children,
ModuleIndex: c.ModuleIndex,
@@ -129,7 +129,7 @@
parts = parts[1:]
} else {
splitNewPart = &kmodpb.RadixNode{
- Type: kmodpb.RadixNode_LITERAL,
+ Type: kmodpb.RadixNode_TYPE_LITERAL,
Literal: currPart.Literal[i:],
ModuleIndex: currPart.ModuleIndex,
}
@@ -143,14 +143,14 @@
return addPatternRec(splitNewPart, parts[1:], nil)
}
- case kmodpb.RadixNode_BYTE_RANGE:
+ case kmodpb.RadixNode_TYPE_BYTE_RANGE:
if c.StartByte == currPart.StartByte && c.EndByte == currPart.EndByte {
if len(parts) == 1 {
c.ModuleIndex = append(c.ModuleIndex, parts[0].ModuleIndex...)
}
return addPatternRec(c, parts[1:], nil)
}
- case kmodpb.RadixNode_SINGLE_WILDCARD, kmodpb.RadixNode_WILDCARD:
+ case kmodpb.RadixNode_TYPE_SINGLE_WILDCARD, kmodpb.RadixNode_TYPE_WILDCARD:
if len(parts) == 1 {
c.ModuleIndex = append(c.ModuleIndex, parts[0].ModuleIndex...)
}
@@ -179,13 +179,13 @@
fmt.Printf("%v ", r.ModuleIndex)
}
switch r.Type {
- case kmodpb.RadixNode_LITERAL:
+ case kmodpb.RadixNode_TYPE_LITERAL:
fmt.Printf("%q: ", r.Literal)
- case kmodpb.RadixNode_SINGLE_WILDCARD:
+ case kmodpb.RadixNode_TYPE_SINGLE_WILDCARD:
fmt.Printf("?: ")
- case kmodpb.RadixNode_WILDCARD:
+ case kmodpb.RadixNode_TYPE_WILDCARD:
fmt.Printf("*: ")
- case kmodpb.RadixNode_BYTE_RANGE:
+ case kmodpb.RadixNode_TYPE_BYTE_RANGE:
fmt.Printf("[%c-%c]: ", rune(r.StartByte), rune(r.EndByte))
default:
log.Fatalf("Unknown tree type %T\n", r)
@@ -210,7 +210,7 @@
storeCurrentLiteral := func() {
if currentLiteral.Len() > 0 {
out = append(out, &kmodpb.RadixNode{
- Type: kmodpb.RadixNode_LITERAL,
+ Type: kmodpb.RadixNode_TYPE_LITERAL,
Literal: currentLiteral.String(),
})
currentLiteral.Reset()
@@ -221,16 +221,16 @@
case '*':
storeCurrentLiteral()
i += 1
- if len(out) > 0 && out[len(out)-1].Type == kmodpb.RadixNode_WILDCARD {
+ if len(out) > 0 && out[len(out)-1].Type == kmodpb.RadixNode_TYPE_WILDCARD {
continue
}
out = append(out, &kmodpb.RadixNode{
- Type: kmodpb.RadixNode_WILDCARD,
+ Type: kmodpb.RadixNode_TYPE_WILDCARD,
})
case '?':
storeCurrentLiteral()
out = append(out, &kmodpb.RadixNode{
- Type: kmodpb.RadixNode_SINGLE_WILDCARD,
+ Type: kmodpb.RadixNode_TYPE_SINGLE_WILDCARD,
})
i += 1
case '[':
@@ -242,7 +242,7 @@
return nil, errors.New("illegal byte range notation, incorrect dash or closing character")
}
nn := &kmodpb.RadixNode{
- Type: kmodpb.RadixNode_BYTE_RANGE,
+ Type: kmodpb.RadixNode_TYPE_BYTE_RANGE,
StartByte: uint32(pattern[i+1]),
EndByte: uint32(pattern[i+3]),
}
diff --git a/osbase/kmod/radix_test.go b/osbase/kmod/radix_test.go
index 62e9d95..e89a514 100644
--- a/osbase/kmod/radix_test.go
+++ b/osbase/kmod/radix_test.go
@@ -20,18 +20,18 @@
expectedNodes []*kmodpb.RadixNode
}{
{"Empty", "", nil},
- {"SingleLiteral", "asdf", []*kmodpb.RadixNode{{Type: kmodpb.RadixNode_LITERAL, Literal: "asdf"}}},
+ {"SingleLiteral", "asdf", []*kmodpb.RadixNode{{Type: kmodpb.RadixNode_TYPE_LITERAL, Literal: "asdf"}}},
{"SingleWildcard", "as*df", []*kmodpb.RadixNode{
- {Type: kmodpb.RadixNode_LITERAL, Literal: "as"},
- {Type: kmodpb.RadixNode_WILDCARD},
- {Type: kmodpb.RadixNode_LITERAL, Literal: "df"},
+ {Type: kmodpb.RadixNode_TYPE_LITERAL, Literal: "as"},
+ {Type: kmodpb.RadixNode_TYPE_WILDCARD},
+ {Type: kmodpb.RadixNode_TYPE_LITERAL, Literal: "df"},
}},
- {"EscapedWildcard", "a\\*", []*kmodpb.RadixNode{{Type: kmodpb.RadixNode_LITERAL, Literal: "a*"}}},
- {"SingleRange", "[y-z]", []*kmodpb.RadixNode{{Type: kmodpb.RadixNode_BYTE_RANGE, StartByte: 121, EndByte: 122}}},
+ {"EscapedWildcard", "a\\*", []*kmodpb.RadixNode{{Type: kmodpb.RadixNode_TYPE_LITERAL, Literal: "a*"}}},
+ {"SingleRange", "[y-z]", []*kmodpb.RadixNode{{Type: kmodpb.RadixNode_TYPE_BYTE_RANGE, StartByte: 121, EndByte: 122}}},
{"SingleWildcardChar", "a?c", []*kmodpb.RadixNode{
- {Type: kmodpb.RadixNode_LITERAL, Literal: "a"},
- {Type: kmodpb.RadixNode_SINGLE_WILDCARD},
- {Type: kmodpb.RadixNode_LITERAL, Literal: "c"},
+ {Type: kmodpb.RadixNode_TYPE_LITERAL, Literal: "a"},
+ {Type: kmodpb.RadixNode_TYPE_SINGLE_WILDCARD},
+ {Type: kmodpb.RadixNode_TYPE_LITERAL, Literal: "c"},
}},
}
for _, c := range cases {
@@ -50,7 +50,7 @@
func TestLookupComplex(t *testing.T) {
root := &kmodpb.RadixNode{
- Type: kmodpb.RadixNode_LITERAL,
+ Type: kmodpb.RadixNode_TYPE_LITERAL,
}
if err := AddPattern(root, "usb:v0B95p1790d*dc*dsc*dp*icFFiscFFip00in*", 2); err != nil {
t.Error(err)
@@ -84,7 +84,7 @@
values := strings.Split(b, "\x00")
var patternsRegexp []regexp.Regexp
root := &kmodpb.RadixNode{
- Type: kmodpb.RadixNode_LITERAL,
+ Type: kmodpb.RadixNode_TYPE_LITERAL,
}
for i, p := range patternsRaw {
if !isASCII(p) {
@@ -103,13 +103,13 @@
regexb.WriteString("(?s)^")
for _, part := range pp {
switch part.Type {
- case kmodpb.RadixNode_LITERAL:
+ case kmodpb.RadixNode_TYPE_LITERAL:
regexb.WriteString(regexp.QuoteMeta(part.Literal))
- case kmodpb.RadixNode_SINGLE_WILDCARD:
+ case kmodpb.RadixNode_TYPE_SINGLE_WILDCARD:
regexb.WriteString(".")
- case kmodpb.RadixNode_WILDCARD:
+ case kmodpb.RadixNode_TYPE_WILDCARD:
regexb.WriteString(".*")
- case kmodpb.RadixNode_BYTE_RANGE:
+ case kmodpb.RadixNode_TYPE_BYTE_RANGE:
regexb.WriteString(fmt.Sprintf("[%s-%s]", regexp.QuoteMeta(string([]rune{rune(part.StartByte)})), regexp.QuoteMeta(string([]rune{rune(part.EndByte)}))))
default:
t.Errorf("Unknown node type %v", part.Type)
diff --git a/osbase/kmod/spec/BUILD.bazel b/osbase/kmod/spec/BUILD.bazel
index 5ff430e..8994546 100644
--- a/osbase/kmod/spec/BUILD.bazel
+++ b/osbase/kmod/spec/BUILD.bazel
@@ -7,7 +7,6 @@
name = "spec_proto_lint_test",
except_rules = [
"PACKAGE_VERSION_SUFFIX",
- "ENUM_VALUE_PREFIX", # TODO: evaluate correctness
"ENUM_ZERO_VALUE_SUFFIX", # TODO: evaluate correctness
],
protos = [":spec_proto"],
diff --git a/osbase/kmod/spec/meta.proto b/osbase/kmod/spec/meta.proto
index 2eb5c7a..634b2ad 100644
--- a/osbase/kmod/spec/meta.proto
+++ b/osbase/kmod/spec/meta.proto
@@ -18,16 +18,16 @@
message RadixNode {
enum Type {
// Matches one or more characters literally.
- LITERAL = 0;
+ TYPE_LITERAL = 0;
// Matches zero or more arbitrary characters.
- WILDCARD = 1;
+ TYPE_WILDCARD = 1;
// Matches exactly one arbitrary character.
- SINGLE_WILDCARD = 2;
+ TYPE_SINGLE_WILDCARD = 2;
// Matches exactly one character between start_byte and end_byte.
- BYTE_RANGE = 3;
+ TYPE_BYTE_RANGE = 3;
// Root matches nothing, but serves a the root node for a radix
// tree.
- ROOT = 4;
+ TYPE_ROOT = 4;
}
Type type = 1;