From e62e0b5ac8d26d7cf76e185c62bf69fa5ddf6f11 Mon Sep 17 00:00:00 2001 From: specter25 Date: Sun, 21 Mar 2021 03:44:52 +0530 Subject: Change naming convention of checksum struct - Change the name of Checksum struct so that it can be used by all spdx versions - Remove unnecessary commented code Signed-off-by: specter25 --- rdfloader/parser2v2/parse_file.go | 8 ++++---- rdfloader/parser2v2/parse_package.go | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'rdfloader') diff --git a/rdfloader/parser2v2/parse_file.go b/rdfloader/parser2v2/parse_file.go index 485aeba..2264eb8 100644 --- a/rdfloader/parser2v2/parse_file.go +++ b/rdfloader/parser2v2/parse_file.go @@ -131,15 +131,15 @@ func (parser *rdfParser2_2) setFileChecksumFromNode(file *spdx.File2_2, checksum return fmt.Errorf("error parsing checksumNode of a file: %v", err) } if file.FileChecksums == nil { - file.FileChecksums = map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2{} + file.FileChecksums = map[spdx.ChecksumAlgorithm]spdx.Checksum{} } switch checksumAlgorithm { case spdx.MD5: - file.FileChecksums[spdx.MD5] = spdx.Checksum2_2{Algorithm: spdx.MD5, Value: checksumValue} + file.FileChecksums[spdx.MD5] = spdx.Checksum{Algorithm: spdx.MD5, Value: checksumValue} case spdx.SHA1: - file.FileChecksums[spdx.SHA1] = spdx.Checksum2_2{Algorithm: spdx.SHA1, Value: checksumValue} + file.FileChecksums[spdx.SHA1] = spdx.Checksum{Algorithm: spdx.SHA1, Value: checksumValue} case spdx.SHA256: - file.FileChecksums[spdx.SHA256] = spdx.Checksum2_2{Algorithm: spdx.SHA256, Value: checksumValue} + file.FileChecksums[spdx.SHA256] = spdx.Checksum{Algorithm: spdx.SHA256, Value: checksumValue} case "": return fmt.Errorf("empty checksum algorithm and value") default: diff --git a/rdfloader/parser2v2/parse_package.go b/rdfloader/parser2v2/parse_package.go index 02dd251..19e2ee6 100644 --- a/rdfloader/parser2v2/parse_package.go +++ b/rdfloader/parser2v2/parse_package.go @@ -302,15 +302,15 @@ func (parser *rdfParser2_2) setPackageChecksum(pkg *spdx.Package2_2, node *gordf return fmt.Errorf("error getting checksum algorithm and value from %v", node) } if pkg.PackageChecksums == nil { - pkg.PackageChecksums = make(map[spdx.ChecksumAlgorithm2_2]spdx.Checksum2_2) + pkg.PackageChecksums = make(map[spdx.ChecksumAlgorithm]spdx.Checksum) } switch checksumAlgorithm { case spdx.MD5: - pkg.PackageChecksums[spdx.MD5] = spdx.Checksum2_2{Algorithm: spdx.MD5, Value: checksumValue} + pkg.PackageChecksums[spdx.MD5] = spdx.Checksum{Algorithm: spdx.MD5, Value: checksumValue} case spdx.SHA1: - pkg.PackageChecksums[spdx.SHA1] = spdx.Checksum2_2{Algorithm: spdx.SHA1, Value: checksumValue} + pkg.PackageChecksums[spdx.SHA1] = spdx.Checksum{Algorithm: spdx.SHA1, Value: checksumValue} case spdx.SHA256: - pkg.PackageChecksums[spdx.SHA256] = spdx.Checksum2_2{Algorithm: spdx.SHA256, Value: checksumValue} + pkg.PackageChecksums[spdx.SHA256] = spdx.Checksum{Algorithm: spdx.SHA256, Value: checksumValue} default: return fmt.Errorf("unknown checksumAlgorithm %s while parsing a package", checksumAlgorithm) } -- cgit v1.2.3