Merge pull request #78 from nextmn/gofmt

Gofmt

internal/database/database.go

@@ -55,7 +55,7 @@ func (db *Database) Init(ctx context.Context) error {
 		for i := range v.num_in {
 			args = append(args, fmt.Sprintf("$%d", i+1))
 		}
-		for _ = range v.num_out {
+		for range v.num_out {
 			args = append(args, "NULL")
 		}
 		strargs := strings.Join(args, ", ")

internal/database/gen.go

@@ -7,7 +7,10 @@ package main
 
 import (
 	"bufio"
+	"bytes"
 	"fmt"
+	"go/format"
+	"io"
 	"os"
 	"strings"
 )
@@ -39,13 +42,8 @@ func main() {
 	}
 	output = strings.Replace(output, ".go", "_gen.go", 1)
 
-	f, err := os.Create(output)
-	if err != nil {
-		panic(err)
-	}
-	defer f.Close()
-
-	if _, err = f.WriteString("// Code generated by gen.go; DO NOT EDIT.\n"); err != nil {
+	var f bytes.Buffer
+	if _, err := f.WriteString("// Code generated by gen.go; DO NOT EDIT.\n"); err != nil {
 		panic(err)
 	}
 	licence := `
@@ -54,16 +52,16 @@ func main() {
 // found in the LICENSE file.
 
 `
-	if _, err = f.WriteString(licence); err != nil {
+	if _, err := f.WriteString(licence); err != nil {
 		panic(err)
 	}
-	if _, err = f.WriteString("package database\n\n"); err != nil {
+	if _, err := f.WriteString("package database\n\n"); err != nil {
 		panic(err)
 	}
-	if _, err = f.WriteString("type procedureOrFunction struct {\n\tnum_in int\n\tnum_out int\n\tis_procedure bool\n}\n\n"); err != nil {
+	if _, err := f.WriteString("type procedureOrFunction struct {\n\tnum_in int\n\tnum_out int\n\tis_procedure bool\n}\n\n"); err != nil {
 		panic(err)
 	}
-	if _, err = f.WriteString("var procedures = map[string]procedureOrFunction{\n"); err != nil {
+	if _, err := f.WriteString("var procedures = map[string]procedureOrFunction{\n"); err != nil {
 		panic(err)
 	}
 	fr, err := os.OpenFile(input, os.O_RDONLY, 0)
@@ -92,7 +90,7 @@ func main() {
 				}
 				psplit := strings.Split(psuffix, "(")
 				pname := psplit[0]
-				if _, err = f.WriteString(fmt.Sprintf("\t\"%s\": procedureOrFunction{is_procedure: true, ", pname)); err != nil {
+				if _, err = f.WriteString(fmt.Sprintf("\t\"%s\": {is_procedure: true, ", pname)); err != nil {
 					panic(err)
 				}
 				stateParser = StateCheckNbArgs
@@ -105,7 +103,7 @@ func main() {
 				}
 				psplit := strings.Split(fsuffix, "(")
 				pname := psplit[0]
-				if _, err = f.WriteString(fmt.Sprintf("\t\"%s\": procedureOrFunction{is_procedure: false, ", pname)); err != nil {
+				if _, err = f.WriteString(fmt.Sprintf("\t\"%s\": {is_procedure: false, ", pname)); err != nil {
 					panic(err)
 				}
 				stateParser = StateCheckNbArgs
@@ -129,4 +127,19 @@ func main() {
 	if _, err = f.WriteString("}\n"); err != nil {
 		panic(err)
 	}
+
+	// running go fmt
+	formatted, err := format.Source(f.Bytes())
+	if err != nil {
+		panic(err)
+	}
+
+	fout, err := os.Create(output)
+	if err != nil {
+		panic(err)
+	}
+	defer fout.Close()
+	if _, err = io.Copy(fout, bytes.NewReader(formatted)); err != nil {
+		panic(err)
+	}
 }

internal/netfunc/endpoint-m-gtp4-e.go

@@ -192,7 +192,7 @@ func (e EndpointMGTP4E) Handle(ctx context.Context, packet []byte) ([]byte, erro
 		// message type: G-PDU
 		MessageType: constants.GTPU_MESSAGE_TYPE_GPDU,
 		TEID:        ipv6DA.PDUSessionID(),
-		// Unfortunatelly, gopacket is not able to compute length at serialization for GTP…
+		// Unfortunately, gopacket is not able to compute length at serialization for GTP…
 		// We need to do it manually :(
 		// TS 128281:
 		// > This field indicates the length in octets of the payload, i.e. the rest of the packet following the mandatory

internal/netfunc/headend-gtp4.go

@@ -85,7 +85,7 @@ func (h HeadendGTP4) Handle(ctx context.Context, packet []byte) ([]byte, error)
 
 	var bsid *config.Bsid
 
-	// find a policy matching criterias
+	// find a policy matching criteria
 	for _, p := range h.policy {
 		// catch-all policy (should be last policy in list)
 		if p.Match == nil {
@@ -131,7 +131,7 @@ func (h HeadendGTP4) Handle(ctx context.Context, packet []byte) ([]byte, error)
 		}
 	}
 	if bsid == nil {
-		return nil, fmt.Errorf("Could not found policy matching criterias")
+		return nil, fmt.Errorf("Could not found policy matching criteria")
 	}
 
 	if bsid.BsidPrefix == nil {