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

sort: simplify file_reader_clean

Browse Source 
Deindent the function, remove useless tests:
 - free already test if argument is NULL
 - closefile already test if the input is stdin or null
This commit is contained in:
Baptiste Daroussin 2022-10-13 10:40:21 +02:00
parent f9d9a7cc4f
commit ffd41d39c6
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -574,7 +574,7 @@ openfile(const char *fn, const char *mode)
void void
closefile(FILE *f, const char *fn) closefile(FILE *f, const char *fn)
{ {
if (f == NULL || f = stdin) if (f == NULL || f == stdin)
return; return;
if (f == stdout) { if (f == stdout) {
fflush(f); fflush(f);
@ -699,25 +699,18 @@ static void
file_reader_clean(struct file_reader *fr) file_reader_clean(struct file_reader *fr)
{ {
if (fr) { if (fr == NULL)
if (fr->mmapaddr) return;
munmap(fr->mmapaddr, fr->mmapsize);
if (fr->fd) if (fr->mmapaddr)
close(fr->fd); munmap(fr->mmapaddr, fr->mmapsize);
if (fr->fd)
close(fr->fd);
if (fr->buffer) free(fr->buffer);
sort_free(fr->buffer); closefile(fr->file, fr->fname);
free(fr->fname);
if (fr->file) memset(fr, 0, sizeof(struct file_reader));
if (fr->file != stdin)
closefile(fr->file, fr->fname);
if(fr->fname)
sort_free(fr->fname);
memset(fr, 0, sizeof(struct file_reader));
}
} }
void void