vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2451 from stevvooe/backport-feed-the-linter

Browse source 
[2.6] registry: feed the linter by removing redundant err check
This commit is contained in:
Stephen Day 2017-11-22 18:09:11 -08:00 • committed by GitHub
commit 803ff0da68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
registry/api/errcode/handler.go
View file

@ -36,9 +36,5 @@ func ServeJSON(w http.ResponseWriter, err error) error {
w.WriteHeader(sc) w.WriteHeader(sc)
if err := json.NewEncoder(w).Encode(err); err != nil { return json.NewEncoder(w).Encode(err)
return err
}
return nil
} }

6
registry/proxy/proxyauth.go
View file

@ -79,9 +79,5 @@ func ping(manager challenge.Manager, endpoint, versionHeader string) error {
} }
defer resp.Body.Close() defer resp.Body.Close()
if err := manager.AddResponse(resp); err != nil { return manager.AddResponse(resp)
return err
}
return nil
} }

6
registry/storage/blobwriter.go
View file

@ -98,11 +98,7 @@ func (bw *blobWriter) Cancel(ctx context.Context) error {
context.GetLogger(ctx).Errorf("error closing blobwriter: %s", err) context.GetLogger(ctx).Errorf("error closing blobwriter: %s", err)
} }
if err := bw.removeResources(ctx); err != nil { return bw.removeResources(ctx)
return err
}
return nil
} }
func (bw *blobWriter) Size() int64 { func (bw *blobWriter) Size() int64 {