diff options
| author | Bob Badour <bbadour@google.com> | 2022-02-09 15:56:59 -0800 |
|---|---|---|
| committer | Bob Badour <bbadour@google.com> | 2022-02-09 15:56:59 -0800 |
| commit | e9b38c175ae19afc82b071822404c33e8f11c295 (patch) | |
| tree | b786667eab84f52d2e80bda59ac4f4de7b4bcb2b | |
| parent | bcb81e74fe61950e2d1a8820af031c0055113120 (diff) | |
| download | build-e9b38c175ae19afc82b071822404c33e8f11c295.tar.gz | |
Greater-than zero is more idiomatic.
Test: m all
Change-Id: I6000d937b98c84226a347b69c69b333a15beb355
| -rw-r--r-- | tools/compliance/cmd/checkshare/checkshare_test.go | 2 | ||||
| -rw-r--r-- | tools/compliance/cmd/htmlnotice/htmlnotice.go | 8 | ||||
| -rw-r--r-- | tools/compliance/cmd/htmlnotice/htmlnotice_test.go | 2 | ||||
| -rw-r--r-- | tools/compliance/cmd/textnotice/textnotice.go | 2 | ||||
| -rw-r--r-- | tools/compliance/noticeindex.go | 10 | ||||
| -rw-r--r-- | tools/compliance/readgraph_test.go | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/tools/compliance/cmd/checkshare/checkshare_test.go b/tools/compliance/cmd/checkshare/checkshare_test.go index 4589595ca8..c9b62e1144 100644 --- a/tools/compliance/cmd/checkshare/checkshare_test.go +++ b/tools/compliance/cmd/checkshare/checkshare_test.go @@ -259,7 +259,7 @@ func Test(t *testing.T) { if len(ts) < 1 { continue } - if 0 < len(actualStdout) { + if len(actualStdout) > 0 { t.Errorf("checkshare: unexpected multiple output lines %q, want %q", actualStdout+"\n"+ts, tt.expectedStdout) } actualStdout = ts diff --git a/tools/compliance/cmd/htmlnotice/htmlnotice.go b/tools/compliance/cmd/htmlnotice/htmlnotice.go index 0e3ba09321..ffb05859ff 100644 --- a/tools/compliance/cmd/htmlnotice/htmlnotice.go +++ b/tools/compliance/cmd/htmlnotice/htmlnotice.go @@ -204,17 +204,17 @@ func htmlNotice(ctx *context, files ...string) error { fmt.Fprintln(ctx.stdout, "li { padding-left: 1em; }") fmt.Fprintln(ctx.stdout, ".file-list { margin-left: 1em; }") fmt.Fprintln(ctx.stdout, "</style>") - if 0 < len(ctx.title) { + if len(ctx.title) > 0 { fmt.Fprintf(ctx.stdout, "<title>%s</title>\n", html.EscapeString(ctx.title)) - } else if 0 < len(ctx.product) { + } else if len(ctx.product) > 0 { fmt.Fprintf(ctx.stdout, "<title>%s</title>\n", html.EscapeString(ctx.product)) } fmt.Fprintln(ctx.stdout, "</head>") fmt.Fprintln(ctx.stdout, "<body>") - if 0 < len(ctx.title) { + if len(ctx.title) > 0 { fmt.Fprintf(ctx.stdout, " <h1>%s</h1>\n", html.EscapeString(ctx.title)) - } else if 0 < len(ctx.product) { + } else if len(ctx.product) > 0 { fmt.Fprintf(ctx.stdout, " <h1>%s</h1>\n", html.EscapeString(ctx.product)) } ids := make(map[string]string) diff --git a/tools/compliance/cmd/htmlnotice/htmlnotice_test.go b/tools/compliance/cmd/htmlnotice/htmlnotice_test.go index b8bc47fb4d..1b01d16a53 100644 --- a/tools/compliance/cmd/htmlnotice/htmlnotice_test.go +++ b/tools/compliance/cmd/htmlnotice/htmlnotice_test.go @@ -678,7 +678,7 @@ func Test(t *testing.T) { } if !inBody { if expectTitle { - if tl := checkTitle(line); 0 < len(tl) { + if tl := checkTitle(line); len(tl) > 0 { if tl != ttle.t { t.Errorf("htmlnotice: unexpected title: got %q, want %q", tl, ttle.t) } diff --git a/tools/compliance/cmd/textnotice/textnotice.go b/tools/compliance/cmd/textnotice/textnotice.go index 9e9229f2bd..58afb48d4c 100644 --- a/tools/compliance/cmd/textnotice/textnotice.go +++ b/tools/compliance/cmd/textnotice/textnotice.go @@ -192,7 +192,7 @@ func textNotice(ctx *context, files ...string) error { return fmt.Errorf("Unable to read license text file(s) for %q: %v\n", files, err) } - if 0 < len(ctx.title) { + if len(ctx.title) > 0 { fmt.Fprintf(ctx.stdout, "%s\n\n", ctx.title) } for h := range ni.Hashes() { diff --git a/tools/compliance/noticeindex.go b/tools/compliance/noticeindex.go index 7bebe3d124..00deb41c11 100644 --- a/tools/compliance/noticeindex.go +++ b/tools/compliance/noticeindex.go @@ -337,14 +337,14 @@ func (ni *NoticeIndex) getLibName(noticeFor *TargetNode) string { } // remove LICENSE or NOTICE or other filename li := strings.LastIndex(match, "/") - if 0 < li { + if li > 0 { match = match[:li] } // remove *licenses/ path segment and subdirectory if in path - if offsets := licensesPathRegexp.FindAllStringIndex(match, -1); offsets != nil && 0 < offsets[len(offsets)-1][0] { + if offsets := licensesPathRegexp.FindAllStringIndex(match, -1); offsets != nil && offsets[len(offsets)-1][0] > 0 { match = match[:offsets[len(offsets)-1][0]] li = strings.LastIndex(match, "/") - if 0 < li { + if li > 0 { match = match[:li] } } @@ -366,7 +366,7 @@ func (ni *NoticeIndex) getLibName(noticeFor *TargetNode) string { // strip off [./]meta_lic from license metadata path and extract base name n := noticeFor.name[:len(noticeFor.name)-9] li := strings.LastIndex(n, "/") - if 0 < li { + if li > 0 { n = n[li+1:] } return n @@ -580,7 +580,7 @@ func (l hashList) Swap(i, j int) { (*l.hashes)[i], (*l.hashes)[j] = (*l.hashes)[ // the `j`th element. func (l hashList) Less(i, j int) bool { var insti, instj int - if 0 < len(l.libName) { + if len(l.libName) > 0 { insti = len(l.ni.hashLibInstall[(*l.hashes)[i]][l.libName]) instj = len(l.ni.hashLibInstall[(*l.hashes)[j]][l.libName]) } else { diff --git a/tools/compliance/readgraph_test.go b/tools/compliance/readgraph_test.go index db52fb193b..bcf9f39603 100644 --- a/tools/compliance/readgraph_test.go +++ b/tools/compliance/readgraph_test.go @@ -94,7 +94,7 @@ func TestReadLicenseGraph(t *testing.T) { } return } - if 0 < len(tt.expectedError) { + if len(tt.expectedError) > 0 { t.Errorf("unexpected success: got no error, want %q err", tt.expectedError) return } |