Skip to content

Commit

Permalink
x86: mkpiggy.c: Explicitly close the output file
Browse files Browse the repository at this point in the history
Even though the resource is released when the application is closed or
when returned from main function, modify the code to make it obvious,
and to keep static analysis tools from complaining.

Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
Link: http://lkml.kernel.org/r/1381184219-10985-1-git-send-email-geyslan@gmail.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
  • Loading branch information
Geyslan G. Bem authored and H. Peter Anvin committed Oct 8, 2013
1 parent d0e639c commit 49449c3
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions arch/x86/boot/compressed/mkpiggy.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,20 @@ int main(int argc, char *argv[])
uint32_t olen;
long ilen;
unsigned long offs;
FILE *f;
FILE *f = NULL;
int retval = 1;

if (argc < 2) {
fprintf(stderr, "Usage: %s compressed_file\n", argv[0]);
return 1;
goto bail;
}

/* Get the information for the compressed kernel image first */

f = fopen(argv[1], "r");
if (!f) {
perror(argv[1]);
return 1;
goto bail;
}


Expand All @@ -58,12 +59,11 @@ int main(int argc, char *argv[])

if (fread(&olen, sizeof(olen), 1, f) != 1) {
perror(argv[1]);
return 1;
goto bail;
}

ilen = ftell(f);
olen = get_unaligned_le32(&olen);
fclose(f);

/*
* Now we have the input (compressed) and output (uncompressed)
Expand Down Expand Up @@ -91,5 +91,9 @@ int main(int argc, char *argv[])
printf(".incbin \"%s\"\n", argv[1]);
printf("input_data_end:\n");

return 0;
retval = 0;
bail:
if (f)
fclose(f);
return retval;
}

0 comments on commit 49449c3

Please sign in to comment.