Split long lines

[govpn.git] / src / cypherpunks.ru / govpn / common.go

diff --git a/src/cypherpunks.ru/govpn/common.go b/src/cypherpunks.ru/govpn/common.go
index 002b1fbfd43a55ba72c8a6704b93abd550dbb86f..684491cfd950516aab0ad412bba1932f84293c36 100644 (file)
--- a/src/cypherpunks.ru/govpn/common.go
+++ b/src/cypherpunks.ru/govpn/common.go
@@ -89,7 +89,11 @@ func (p Protocol) MarshalJSON() ([]byte, error) {
 func (p *Protocol) UnmarshalJSON(encoded []byte) error {
        var str string
        if err := json.Unmarshal(encoded, &str); err != nil {
-               return errors.Wrapf(err, "Can't unmarshall to string %q", hex.EncodeToString(encoded))
+               return errors.Wrapf(
+                       err,
+                       "Can't unmarshall to string %q",
+                       hex.EncodeToString(encoded),
+               )
        }
        proto, err := NewProtocolFromString(str)
        if err != nil {
@@ -136,7 +140,9 @@ func NewProtocolFromString(p string) (Protocol, error) {
                index++
        }
 
-       return Protocol(-1), errors.Errorf("Invalid protocol %q: %s", p, strings.Join(choices, ","))
+       return Protocol(-1), errors.Errorf(
+               "Invalid protocol %q: %s", p, strings.Join(choices, ","),
+       )
 }
 
 // SliceZero zeros each byte.
@@ -178,6 +184,6 @@ func SetLogger(l *logrus.Logger) {
 // CloseLog log an error if a io.Closer fail to Close
 func CloseLog(c io.Closer, l *logrus.Logger, fields logrus.Fields) {
        if err := c.Close(); err != nil {
-               logrus.WithFields(fields).WithError(err).Error("Couldn't close connection")
+               logrus.WithFields(fields).WithError(err).Error("Can't close connection")
        }
 }