TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-25 11:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

all: fix nilness issues

Browse Source 
Signed-off-by: Matt Layher <mdlayher@gmail.com>
This commit is contained in:
Matt Layher 2023-12-05 10:32:35 -05:00 committed by Andrew Dunham
parent c5208f8138
commit a217f1fccf
7 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/containerboot/main_test.go
View File

@ -999,9 +999,6 @@ func (k *kubeServer) serveSecret(w http.ResponseWriter, r *http.Request) {
defer k.Unlock() defer k.Unlock()
for k, v := range k.secret { for k, v := range k.secret {
v := base64.StdEncoding.EncodeToString([]byte(v)) v := base64.StdEncoding.EncodeToString([]byte(v))
if err != nil {
panic("encode failed")
}
ret["data"][k] = v ret["data"][k] = v
} }
if err := json.NewEncoder(w).Encode(ret); err != nil { if err := json.NewEncoder(w).Encode(ret); err != nil {

3
control/controlclient/direct.go
View File

@ -710,9 +710,6 @@ func (c *Direct) doLogin(ctx context.Context, opt loginOpt) (mustRegen bool, new
c.persist = persist.View() c.persist = persist.View()
c.mu.Unlock() c.mu.Unlock()
if err != nil {
return regen, "", nil, err
}
if ctx.Err() != nil { if ctx.Err() != nil {
return regen, "", nil, ctx.Err() return regen, "", nil, ctx.Err()
} }

2
ipn/ipnlocal/cert.go
View File

@ -594,7 +594,7 @@ func acmeKey(cs certStore) (crypto.Signer, error) {
return nil, errors.New("acme/autocert: invalid account key found in cache") return nil, errors.New("acme/autocert: invalid account key found in cache")
} }
return parsePrivateKey(priv.Bytes) return parsePrivateKey(priv.Bytes)
} else if err != nil && !errors.Is(err, ipn.ErrStateNotExist) { } else if !errors.Is(err, ipn.ErrStateNotExist) {
return nil, err return nil, err
} }

2
ipn/ipnserver/proxyconnect.go
View File

@ -48,7 +48,7 @@ func (s *Server) handleProxyConnectConn(w http.ResponseWriter, r *http.Request)
hj, ok := w.(http.Hijacker) hj, ok := w.(http.Hijacker)
if !ok { if !ok {
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, "CONNECT hijack unavailable", http.StatusInternalServerError)
return return
} }
c, br, err := hj.Hijack() c, br, err := hj.Hijack()

3
ipn/prefs.go
View File

@ -444,8 +444,7 @@ func (p *Prefs) Equals(p2 *Prefs) bool {
return false return false
} }
return p != nil && p2 != nil && return p.ControlURL == p2.ControlURL &&
p.ControlURL == p2.ControlURL &&
p.RouteAll == p2.RouteAll && p.RouteAll == p2.RouteAll &&
p.AllowSingleHosts == p2.AllowSingleHosts && p.AllowSingleHosts == p2.AllowSingleHosts &&
p.ExitNodeID == p2.ExitNodeID && p.ExitNodeID == p2.ExitNodeID &&

2
portlist/portlist_linux.go
View File

@ -178,7 +178,7 @@ func (li *linuxImpl) parseProcNetFile(r *bufio.Reader, fileBase string) error {
// Scratch buffer for making inode strings. // Scratch buffer for making inode strings.
inoBuf := make([]byte, 0, 50) inoBuf := make([]byte, 0, 50)
for err == nil { for {
line, err := r.ReadSlice('\n') line, err := r.ReadSlice('\n')
if err == io.EOF { if err == io.EOF {
break break

8
posture/serialnumber_notmacos.go
View File

@ -99,13 +99,7 @@ func GetSerialNumbers(logf logger.Logf) ([]string, error) {
} }
} }
// if there were no serial numbers, check if any errors were logf("got serial numbers %v", serials)
// returned and combine them.
if len(serials) == 0 && err != nil {
return nil, err
}
logf("got serial numbers %v (errors: %s)", serials, err)
return serials, nil return serials, nil
} }