From f5d67fbd9c633bd2e0e815ada0a8dea352ea42d4 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Tue, 31 Jul 2018 12:16:54 +0200
Subject: .gometalinter.json: enable gofmt

The part that we want from gofmt is simplify (-s).
Fix all code that needs fixing.

Update #538
---
 sys/linux/init_alg.go  | 10 +++++-----
 sys/targets/targets.go | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'sys')

diff --git a/sys/linux/init_alg.go b/sys/linux/init_alg.go
index 2e9337fe8..8de400048 100644
--- a/sys/linux/init_alg.go
+++ b/sys/linux/init_alg.go
@@ -122,7 +122,7 @@ var allTypes = []algType{
 }
 
 var allAlgs = map[int][]algDesc{
-	ALG_AEAD: []algDesc{
+	ALG_AEAD: {
 		// templates:
 		{"authencesn", []int{ALG_HASH, ALG_BLKCIPHER}},
 		{"authenc", []int{ALG_HASH, ALG_BLKCIPHER}},
@@ -162,7 +162,7 @@ var allAlgs = map[int][]algDesc{
 		{"aegis256-generic", nil},
 		{"aegis256-aesni", nil},
 	},
-	ALG_BLKCIPHER: []algDesc{
+	ALG_BLKCIPHER: {
 		// templates:
 		{"pcbc", []int{ALG_CIPHER}},
 		{"cbc", []int{ALG_CIPHER}},
@@ -289,7 +289,7 @@ var allAlgs = map[int][]algDesc{
 		{"ecb(des3_ede)", nil},
 		{"ecb-des3_ede-asm", nil},
 	},
-	ALG_CIPHER: []algDesc{
+	ALG_CIPHER: {
 		{"aes", nil},
 		{"aes-aesni", nil},
 		{"seed", nil},
@@ -336,7 +336,7 @@ var allAlgs = map[int][]algDesc{
 		{"cipher_null-generic", nil},
 		{"aes-asm", nil},
 	},
-	ALG_HASH: []algDesc{
+	ALG_HASH: {
 		// templates:
 		{"cmac", []int{ALG_CIPHER}},
 		{"cbcmac", []int{ALG_CIPHER}},
@@ -435,7 +435,7 @@ var allAlgs = map[int][]algDesc{
 		{"sha1-ssse3", nil},
 		{"crc32c-intel", nil},
 	},
-	ALG_RNG: []algDesc{
+	ALG_RNG: {
 		{"stdrng", nil},
 		{"ansi_cprng", nil},
 		{"jitterentropy_rng", nil},
diff --git a/sys/targets/targets.go b/sys/targets/targets.go
index 72afab4fa..59220625c 100644
--- a/sys/targets/targets.go
+++ b/sys/targets/targets.go
@@ -57,7 +57,7 @@ func Get(OS, arch string) *Target {
 
 // nolint: lll
 var List = map[string]map[string]*Target{
-	"test": map[string]*Target{
+	"test": {
 		"64": {
 			PtrSize:     8,
 			PageSize:    4 << 10,
@@ -107,7 +107,7 @@ var List = map[string]map[string]*Target{
 			},
 		},
 	},
-	"linux": map[string]*Target{
+	"linux": {
 		"amd64": {
 			PtrSize:          8,
 			PageSize:         4 << 10,
@@ -158,7 +158,7 @@ var List = map[string]map[string]*Target{
 			KernelHeaderArch: "powerpc",
 		},
 	},
-	"freebsd": map[string]*Target{
+	"freebsd": {
 		"amd64": {
 			PtrSize:     8,
 			PageSize:    4 << 10,
@@ -166,7 +166,7 @@ var List = map[string]map[string]*Target{
 			CrossCFlags: []string{"-m64", "-static"},
 		},
 	},
-	"netbsd": map[string]*Target{
+	"netbsd": {
 		"amd64": {
 			PtrSize:     8,
 			PageSize:    4 << 10,
@@ -174,7 +174,7 @@ var List = map[string]map[string]*Target{
 			CrossCFlags: []string{"-m64", "-static"},
 		},
 	},
-	"fuchsia": map[string]*Target{
+	"fuchsia": {
 		"amd64": {
 			PtrSize:          8,
 			PageSize:         4 << 10,
@@ -212,14 +212,14 @@ var List = map[string]map[string]*Target{
 			},
 		},
 	},
-	"windows": map[string]*Target{
+	"windows": {
 		"amd64": {
 			PtrSize: 8,
 			// TODO(dvyukov): what should we do about 4k vs 64k?
 			PageSize: 4 << 10,
 		},
 	},
-	"akaros": map[string]*Target{
+	"akaros": {
 		"amd64": {
 			PtrSize:           8,
 			PageSize:          4 << 10,
-- 
cgit mrf-deployment