d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sort: deindent file_reader_free and cleanup its usage

Browse Source
This commit is contained in:
Baptiste Daroussin 2022-10-13 10:51:17 +02:00
parent ffd41d39c6
commit 226e41467e
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.bin/sort/file.c
View File

@ -717,10 +717,10 @@ void
file_reader_free(struct file_reader *fr) file_reader_free(struct file_reader *fr)
{ {
if (fr) { if (fr == NULL)
file_reader_clean(fr); return;
sort_free(fr); file_reader_clean(fr);
} free(fr);
} }
int int
@ -820,10 +820,8 @@ file_header_close(struct file_header **fh)
{ {
if (fh && *fh) { if (fh && *fh) {
if ((*fh)->fr) { file_reader_free((*fh)->fr);
file_reader_free((*fh)->fr); (*fh)->fr = NULL;
(*fh)->fr = NULL;
}
if ((*fh)->si) { if ((*fh)->si) {
sort_list_item_clean((*fh)->si); sort_list_item_clean((*fh)->si);
sort_free((*fh)->si); sort_free((*fh)->si);