refactor: file close error

Signed-off-by: Gaius <gaius.qi@gmail.com>

client/daemon/objectstorage/objectstorage.go

@@ -592,8 +592,7 @@ func (o *objectStorage) md5FromFileHeader(fileHeader *multipart.FileHeader) (dig
 		return nil
 	}
 	defer func() {
-		errClose := f.Close()
-		if errClose != nil {
+		if err := f.Close(); err != nil {
 			dig = nil
 		}
 	}()
@@ -608,9 +607,8 @@ func (o *objectStorage) importObjectToBackend(ctx context.Context, bucketName, o
 		return err
 	}
 	defer func() {
-		errClose := f.Close()
-		if errClose != nil {
-			err = errors.Join(err, errClose)
+		if cerr := f.Close(); cerr != nil {
+			err = errors.Join(err, cerr)
 		}
 	}()
 
@@ -689,9 +687,8 @@ func (o *objectStorage) importObjectToSeedPeer(ctx context.Context, seedPeerHost
 		return err
 	}
 	defer func() {
-		errClose := f.Close()
-		if errClose != nil {
-			err = errors.Join(err, errClose)
+		if cerr := f.Close(); cerr != nil {
+			err = errors.Join(err, cerr)
 		}
 	}()
 

client/daemon/peer/piece_manager.go

@@ -674,9 +674,8 @@ func (pm *pieceManager) ImportFile(ctx context.Context, ptm storage.PeerTaskMeta
 		return errors.New(msg)
 	}
 	defer func() {
-		errClose := file.Close()
-		if errClose != nil {
-			err = errors.Join(err, errClose)
+		if cerr := file.Close(); cerr != nil {
+			err = errors.Join(err, cerr)
 		}
 	}()
 

client/daemon/storage/local_storage.go

@@ -130,9 +130,8 @@ func (t *localTaskStore) WritePiece(ctx context.Context, req *WritePieceRequest)
 		return 0, err
 	}
 	defer func() {
-		errClose := file.Close()
-		if errClose != nil {
-			err = errors.Join(err, errClose)
+		if cerr := file.Close(); cerr != nil {
+			err = errors.Join(err, cerr)
 		}
 	}()
 
@@ -405,9 +404,8 @@ func (t *localTaskStore) Store(ctx context.Context, req *StoreRequest) (err erro
 		return err
 	}
 	defer func() {
-		errClose := file.Close()
-		if errClose != nil {
-			err = errors.Join(err, errClose)
+		if cerr := file.Close(); cerr != nil {
+			err = errors.Join(err, cerr)
 		}
 	}()
 
@@ -422,9 +420,8 @@ func (t *localTaskStore) Store(ctx context.Context, req *StoreRequest) (err erro
 		return err
 	}
 	defer func() {
-		errClose := dstFile.Close()
-		if errClose != nil {
-			err = errors.Join(err, errClose)
+		if cerr := dstFile.Close(); cerr != nil {
+			err = errors.Join(err, cerr)
 		}
 	}()
 	// copy_file_range is valid in linux
@@ -658,9 +655,8 @@ func (t *localTaskStore) saveMetadata() (err error) {
 		return err
 	}
 	defer func() {
-		errClose := metadata.Close()
-		if errClose != nil {
-			err = errors.Join(err, errClose)
+		if cerr := metadata.Close(); cerr != nil {
+			err = errors.Join(err, cerr)
 		}
 	}()
 	_, err = metadata.Write(data)

client/daemon/storage/local_storage_subtask.go

@@ -74,9 +74,8 @@ func (t *localSubTaskStore) WritePiece(ctx context.Context, req *WritePieceReque
 		return 0, err
 	}
 	defer func() {
-		errClose := file.Close()
-		if errClose != nil {
-			err = errors.Join(err, errClose)
+		if cerr := file.Close(); cerr != nil {
+			err = errors.Join(err, cerr)
 		}
 	}()
 	// TODO different with localTaskStore
@@ -315,9 +314,8 @@ func (t *localSubTaskStore) Store(ctx context.Context, req *StoreRequest) (err e
 		return err
 	}
 	defer func() {
-		errClose := file.Close()
-		if errClose != nil {
-			err = errors.Join(err, errClose)
+		if cerr := file.Close(); cerr != nil {
+			err = errors.Join(err, cerr)
 		}
 	}()
 
@@ -332,9 +330,8 @@ func (t *localSubTaskStore) Store(ctx context.Context, req *StoreRequest) (err e
 		return err
 	}
 	defer func() {
-		errClose := dstFile.Close()
-		if errClose != nil {
-			err = errors.Join(err, errClose)
+		if cerr := dstFile.Close(); cerr != nil {
+			err = errors.Join(err, cerr)
 		}
 	}()
 	// copy_file_range is valid in linux

client/dfget/dfget.go

@@ -164,9 +164,8 @@ func downloadFromSource(ctx context.Context, cfg *config.DfgetConfig, hdr map[st
 				fmt.Printf("remove temporary file %s error: %s\n", tempPath, removeErr)
 			}
 		}
-		errClose := tempFile.Close()
-		if errClose != nil {
-			err = errors.Join(err, errClose)
+		if cerr := tempFile.Close(); cerr != nil {
+			err = errors.Join(err, cerr)
 		}
 	}()
 
@@ -178,9 +177,8 @@ func downloadFromSource(ctx context.Context, cfg *config.DfgetConfig, hdr map[st
 		return err
 	}
 	defer func() {
-		errClose := response.Body.Close()
-		if errClose != nil {
-			err = errors.Join(err, errClose)
+		if cerr := response.Body.Close(); cerr != nil {
+			err = errors.Join(err, cerr)
 		}
 	}()
 	if err = response.Validate(); err != nil {

scheduler/storage/storage.go

@@ -386,9 +386,8 @@ func (s *storage) createDownload(downloads ...Download) (err error) {
 		return err
 	}
 	defer func() {
-		errClose := file.Close()
-		if errClose != nil {
-			err = errors.Join(err, errClose)
+		if cerr := file.Close(); cerr != nil {
+			err = errors.Join(err, cerr)
 		}
 	}()
 
@@ -402,9 +401,8 @@ func (s *storage) createNetworkTopology(networkTopologies ...NetworkTopology) (e
 		return err
 	}
 	defer func() {
-		errClose := file.Close()
-		if errClose != nil {
-			err = errors.Join(err, errClose)
+		if cerr := file.Close(); cerr != nil {
+			err = errors.Join(err, cerr)
 		}
 	}()
 

trainer/storage/storage.go

@@ -81,9 +81,8 @@ func (s *storage) ListDownload(key string) (downloads []schedulerstorage.Downloa
 		return nil, err
 	}
 	defer func() {
-		errClose := file.Close()
-		if errClose != nil {
-			err = errors.Join(err, errClose)
+		if cerr := file.Close(); cerr != nil {
+			err = errors.Join(err, cerr)
 		}
 	}()
 
@@ -101,9 +100,8 @@ func (s *storage) ListNetworkTopology(key string) (networkTopologies []scheduler
 		return nil, err
 	}
 	defer func() {
-		errClose := file.Close()
-		if errClose != nil {
-			err = errors.Join(err, errClose)
+		if cerr := file.Close(); cerr != nil {
+			err = errors.Join(err, cerr)
 		}
 	}()