vikarti.anatra/safing-portbase
1
0
Fork 0
mirror of https://github.com/safing/portbase synced 2026-04-30 21:00:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up database/query package

Browse source
This commit is contained in:
Daniel 2019-09-20 22:01:17 +02:00
parent ac6d9db456
commit 60dea8092f
7 changed files with 37 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
database/query/parser.go
View file

@ -205,7 +205,7 @@ func parseAndOr(getSnippet func() (*snippet, error), remainingSnippets func() in
for {
if !expectingMore && rootCondition && remainingSnippets() == 0 {
// advance snippetsPos by one, as it will be set back by 1
getSnippet()
getSnippet() //nolint:errcheck
if len(conditions) == 1 {
return conditions[0], nil
}
@ -330,7 +330,7 @@ func parseCondition(firstSnippet *snippet, getSnippet func() (*snippet, error))
}
var (
escapeReplacer = regexp.MustCompile("\\\\([^\\\\])")
escapeReplacer = regexp.MustCompile(`\\([^\\])`)
)
// prepToken removes surrounding parenthesis and escape characters.