Skip to content

Commit

Permalink
Minor nitpicks
Browse files Browse the repository at this point in the history
  • Loading branch information
evenh committed Apr 27, 2021
1 parent a905c02 commit 17b93da
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
4 changes: 1 addition & 3 deletions internal/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,7 @@ func configureSubscriber(files chan *HashdeepEntry, writer *HashdeepOutputFile,
for {
fileEntry, more := <-files
if more {
err := writer.WriteEntry(fileEntry)

if err != nil {
if err := writer.WriteEntry(fileEntry); err != nil {
log.Warn(err)
}

Expand Down
8 changes: 2 additions & 6 deletions internal/hashdeep.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,18 +85,14 @@ func (h HashdeepOutputFile) WriteEntry(e *HashdeepEntry) error {
}

func (h *HashdeepOutputFile) Close() error {
err := h.writer.Flush()
if err != nil {
if err := h.writer.Flush(); err != nil {
return errors.Wrap(err, "Could not flush output writer")
}

err = h.file.Close()

if err != nil {
if err := h.file.Close(); err != nil {
return errors.Wrapf(err, "Could not close results file '%s'", h.OutputFile)
}

log.Info("Flushed and closed results file")

return nil
}

0 comments on commit 17b93da

Please sign in to comment.