chore: more idiomatic code (#212)

Signed-off-by: guoguangwu <guoguangwu@magic-shield.com>
spdx · May 12, 2023 · 13245e0 · 13245e0
1 parent ee0b98b
commit 13245e0
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 16 deletions.
diff --git a/reporter/reporter.go b/reporter/reporter.go
@@ -17,7 +17,7 @@ import (
 // io.Writer, and outputs to the io.Writer a tabulated count of
 // the number of Files for each unique LicenseConcluded in the set.
 func Generate(pkg *spdx.Package, w io.Writer) error {
-	if pkg.FilesAnalyzed == false {
+	if !pkg.FilesAnalyzed {
 		return fmt.Errorf("Package FilesAnalyzed is false")
 	}
 	totalFound, totalNotFound, foundCounts := countLicenses(pkg)
@@ -29,10 +29,10 @@ func Generate(pkg *spdx.Package, w io.Writer) error {
 	fmt.Fprintf(wr, "%d\t  TOTAL\n", totalFound+totalNotFound)
 	fmt.Fprintf(wr, "\n")
 
-	counts := []struct {
+	var counts []struct {
 		lic   string
 		count int
-	}{}
+	}
 	for k, v := range foundCounts {
 		var entry struct {
 			lic   string

diff --git a/spdx/v2/v2_1/tagvalue/writer/save_package.go b/spdx/v2/v2_1/tagvalue/writer/save_package.go
@@ -42,14 +42,14 @@ func renderPackage(pkg *spdx.Package, w io.Writer) error {
 	if pkg.PackageDownloadLocation != "" {
 		fmt.Fprintf(w, "PackageDownloadLocation: %s\n", pkg.PackageDownloadLocation)
 	}
-	if pkg.FilesAnalyzed == true {
-		if pkg.IsFilesAnalyzedTagPresent == true {
+	if pkg.FilesAnalyzed {
+		if pkg.IsFilesAnalyzedTagPresent {
 			fmt.Fprintf(w, "FilesAnalyzed: true\n")
 		}
 	} else {
 		fmt.Fprintf(w, "FilesAnalyzed: false\n")
 	}
-	if pkg.PackageVerificationCode.Value != "" && pkg.FilesAnalyzed == true {
+	if pkg.PackageVerificationCode.Value != "" && pkg.FilesAnalyzed {
 		if len(pkg.PackageVerificationCode.ExcludedFiles) == 0 {
 			fmt.Fprintf(w, "PackageVerificationCode: %s\n", pkg.PackageVerificationCode.Value)
 		} else {
@@ -70,7 +70,7 @@ func renderPackage(pkg *spdx.Package, w io.Writer) error {
 	if pkg.PackageLicenseConcluded != "" {
 		fmt.Fprintf(w, "PackageLicenseConcluded: %s\n", pkg.PackageLicenseConcluded)
 	}
-	if pkg.FilesAnalyzed == true {
+	if pkg.FilesAnalyzed {
 		for _, s := range pkg.PackageLicenseInfoFromFiles {
 			fmt.Fprintf(w, "PackageLicenseInfoFromFiles: %s\n", s)
 		}

diff --git a/spdx/v2/v2_2/rdf/reader/license_utils.go b/spdx/v2/v2_2/rdf/reader/license_utils.go
@@ -71,7 +71,7 @@ func getAlgorithmFromURI(algorithmURI string) (checksumAlgorithm string, err err
 // from a list of licenses, it returns a
 // list of string representation of those licenses.
 func mapLicensesToStrings(licences []AnyLicenseInfo) []string {
-	res := make([]string, len(licences), len(licences))
+	res := make([]string, len(licences))
 	for i, lic := range licences {
 		res[i] = lic.ToLicenseString()
 	}

diff --git a/spdx/v2/v2_2/rdf/reader/parse_snippet_info.go b/spdx/v2/v2_2/rdf/reader/parse_snippet_info.go
@@ -34,6 +34,9 @@ func (parser *rdfParser2_2) getSnippetInformationFromNode2_2(node *gordfParser.N
 				return nil, err
 			}
 			docElemID, err := ExtractDocElementID(getLastPartOfURI(siTriple.Object.ID))
+			if err != nil {
+				return nil, err
+			}
 			si.SnippetFromFileSPDXIdentifier = docElemID.ElementRefID
 		case SPDX_RANGE:
 			// cardinality: min 1

diff --git a/spdx/v2/v2_2/tagvalue/writer/save_package.go b/spdx/v2/v2_2/tagvalue/writer/save_package.go
@@ -42,14 +42,14 @@ func renderPackage(pkg *spdx.Package, w io.Writer) error {
 	if pkg.PackageDownloadLocation != "" {
 		fmt.Fprintf(w, "PackageDownloadLocation: %s\n", pkg.PackageDownloadLocation)
 	}
-	if pkg.FilesAnalyzed == true {
-		if pkg.IsFilesAnalyzedTagPresent == true {
+	if pkg.FilesAnalyzed {
+		if pkg.IsFilesAnalyzedTagPresent {
 			fmt.Fprintf(w, "FilesAnalyzed: true\n")
 		}
 	} else {
 		fmt.Fprintf(w, "FilesAnalyzed: false\n")
 	}
-	if pkg.PackageVerificationCode.Value != "" && pkg.FilesAnalyzed == true {
+	if pkg.PackageVerificationCode.Value != "" && pkg.FilesAnalyzed {
 		if len(pkg.PackageVerificationCode.ExcludedFiles) == 0 {
 			fmt.Fprintf(w, "PackageVerificationCode: %s\n", pkg.PackageVerificationCode.Value)
 		} else {
@@ -70,7 +70,7 @@ func renderPackage(pkg *spdx.Package, w io.Writer) error {
 	if pkg.PackageLicenseConcluded != "" {
 		fmt.Fprintf(w, "PackageLicenseConcluded: %s\n", pkg.PackageLicenseConcluded)
 	}
-	if pkg.FilesAnalyzed == true {
+	if pkg.FilesAnalyzed {
 		for _, s := range pkg.PackageLicenseInfoFromFiles {
 			fmt.Fprintf(w, "PackageLicenseInfoFromFiles: %s\n", s)
 		}

diff --git a/spdx/v2/v2_3/rdf/reader/license_utils.go b/spdx/v2/v2_3/rdf/reader/license_utils.go
@@ -71,7 +71,7 @@ func getAlgorithmFromURI(algorithmURI string) (checksumAlgorithm string, err err
 // from a list of licenses, it returns a
 // list of string representation of those licenses.
 func mapLicensesToStrings(licences []AnyLicenseInfo) []string {
-	res := make([]string, len(licences), len(licences))
+	res := make([]string, len(licences))
 	for i, lic := range licences {
 		res[i] = lic.ToLicenseString()
 	}

diff --git a/spdx/v2/v2_3/tagvalue/writer/save_package.go b/spdx/v2/v2_3/tagvalue/writer/save_package.go
@@ -54,8 +54,8 @@ func renderPackage(pkg *spdx.Package, w io.Writer) error {
 	if pkg.ValidUntilDate != "" {
 		fmt.Fprintf(w, "ValidUntilDate: %s\n", pkg.ValidUntilDate)
 	}
-	if pkg.FilesAnalyzed == true {
-		if pkg.IsFilesAnalyzedTagPresent == true {
+	if pkg.FilesAnalyzed {
+		if pkg.IsFilesAnalyzedTagPresent {
 			fmt.Fprintf(w, "FilesAnalyzed: true\n")
 		}
 	} else {
@@ -82,7 +82,7 @@ func renderPackage(pkg *spdx.Package, w io.Writer) error {
 	if pkg.PackageLicenseConcluded != "" {
 		fmt.Fprintf(w, "PackageLicenseConcluded: %s\n", pkg.PackageLicenseConcluded)
 	}
-	if pkg.FilesAnalyzed == true {
+	if pkg.FilesAnalyzed {
 		for _, s := range pkg.PackageLicenseInfoFromFiles {
 			fmt.Fprintf(w, "PackageLicenseInfoFromFiles: %s\n", s)
 		}