diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2011-08-18 17:50:45 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2011-08-18 20:47:52 +0100 |
| commit | a51c96f8d934c02dcf6fdec4e47905584d18f9f1 (patch) | |
| tree | 9f5303a5c9676b0eb51b5e862df25f3a8853288e | |
| parent | 8a3fcac328ba09e16c0c5b661c62ff9b25752c8b (diff) | |
| download | efilinux-a51c96f8d934c02dcf6fdec4e47905584d18f9f1.tar.gz | |
bzimage: Rename shadow variable 'file'
We currently have two 'file' variables in load_kernel(), and the
outermost variable is live across the inner one. Rename the innermost
variable to 'rdfile' since it's used for initrd's.
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| -rw-r--r-- | loaders/bzimage/bzimage.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/loaders/bzimage/bzimage.c b/loaders/bzimage/bzimage.c index 5542009..cab1431 100644 --- a/loaders/bzimage/bzimage.c +++ b/loaders/bzimage/bzimage.c @@ -137,7 +137,7 @@ load_kernel(EFI_HANDLE image, CHAR16 *name, char *cmdline) /* Make sure the initrd string is valid */ if (*initrd++ == '=') { CHAR16 filename[MAX_FILENAME], *n; - struct file *file; + struct file *rdfile; char *o, *p; UINT64 size; void *rd; @@ -150,26 +150,26 @@ load_kernel(EFI_HANDLE image, CHAR16 *name, char *cmdline) *n = *o; *n = '\0'; - err = file_open(filename, &file); + err = file_open(filename, &rdfile); if (err != EFI_SUCCESS) goto out; - file_size(file, &size); + file_size(rdfile, &size); err = emalloc(size, 1, (EFI_PHYSICAL_ADDRESS *)&rd); if (err != EFI_SUCCESS) { - file_close(file); + file_close(rdfile); goto out; } if ((UINT32)(UINT64)rd > buf->hdr.ramdisk_max) { Print(L"ramdisk address is too high!\n"); efree((EFI_PHYSICAL_ADDRESS)rd, size); - file_close(file); + file_close(rdfile); goto out; } - err = file_read(file, &size, rd); - file_close(file); + err = file_read(rdfile, &size, rd); + file_close(rdfile); if (err != EFI_SUCCESS) goto out; |