| Message ID | 1469480404-51702-1-git-send-email-colin.king@canonical.com |
|---|---|
| State | Accepted |
| Headers | show |
On 2016-07-26 05:00 AM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Minor change to fix cppcheck style warnings, no functional change > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > src/lib/src/fwts_smbios.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/lib/src/fwts_smbios.c b/src/lib/src/fwts_smbios.c > index c494043..73b3f2b 100644 > --- a/src/lib/src/fwts_smbios.c > +++ b/src/lib/src/fwts_smbios.c > @@ -50,9 +50,9 @@ static int fwts_load_file(const char* filename, void *buf, size_t size) > static void *fwts_smbios_find_entry_uefi(fwts_framework *fw, fwts_smbios_entry *entry, fwts_smbios_type *type) > { > void *addr; > - fwts_smbios_entry *mapped_entry; > > if ((addr = fwts_scan_efi_systab("SMBIOS")) != NULL) { > + fwts_smbios_entry *mapped_entry; > > if ((mapped_entry = fwts_mmap((off_t)addr, sizeof(fwts_smbios_entry))) != FWTS_MAP_FAILED) { > *entry = *mapped_entry; > @@ -80,9 +80,9 @@ static void *fwts_smbios_find_entry_uefi(fwts_framework *fw, fwts_smbios_entry * > static void *fwts_smbios30_find_entry_uefi(fwts_framework *fw, fwts_smbios30_entry *entry) > { > void *addr; > - fwts_smbios30_entry *mapped_entry; > > if ((addr = fwts_scan_efi_systab("SMBIOS3")) != NULL) { > + fwts_smbios30_entry *mapped_entry; > > if ((mapped_entry = fwts_mmap((off_t)addr, sizeof(fwts_smbios30_entry))) != FWTS_MAP_FAILED) { > *entry = *mapped_entry; > Acked-by: Alex Hung <alex.hung@canonical.com>
On 2016年07月26日 05:00, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Minor change to fix cppcheck style warnings, no functional change > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > src/lib/src/fwts_smbios.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/lib/src/fwts_smbios.c b/src/lib/src/fwts_smbios.c > index c494043..73b3f2b 100644 > --- a/src/lib/src/fwts_smbios.c > +++ b/src/lib/src/fwts_smbios.c > @@ -50,9 +50,9 @@ static int fwts_load_file(const char* filename, void *buf, size_t size) > static void *fwts_smbios_find_entry_uefi(fwts_framework *fw, fwts_smbios_entry *entry, fwts_smbios_type *type) > { > void *addr; > - fwts_smbios_entry *mapped_entry; > > if ((addr = fwts_scan_efi_systab("SMBIOS")) != NULL) { > + fwts_smbios_entry *mapped_entry; > > if ((mapped_entry = fwts_mmap((off_t)addr, sizeof(fwts_smbios_entry))) != FWTS_MAP_FAILED) { > *entry = *mapped_entry; > @@ -80,9 +80,9 @@ static void *fwts_smbios_find_entry_uefi(fwts_framework *fw, fwts_smbios_entry * > static void *fwts_smbios30_find_entry_uefi(fwts_framework *fw, fwts_smbios30_entry *entry) > { > void *addr; > - fwts_smbios30_entry *mapped_entry; > > if ((addr = fwts_scan_efi_systab("SMBIOS3")) != NULL) { > + fwts_smbios30_entry *mapped_entry; > > if ((mapped_entry = fwts_mmap((off_t)addr, sizeof(fwts_smbios30_entry))) != FWTS_MAP_FAILED) { > *entry = *mapped_entry; > Acked-by: Ivan Hu <ivan.hu@canonical.com>
diff --git a/src/lib/src/fwts_smbios.c b/src/lib/src/fwts_smbios.c index c494043..73b3f2b 100644 --- a/src/lib/src/fwts_smbios.c +++ b/src/lib/src/fwts_smbios.c @@ -50,9 +50,9 @@ static int fwts_load_file(const char* filename, void *buf, size_t size) static void *fwts_smbios_find_entry_uefi(fwts_framework *fw, fwts_smbios_entry *entry, fwts_smbios_type *type) { void *addr; - fwts_smbios_entry *mapped_entry; if ((addr = fwts_scan_efi_systab("SMBIOS")) != NULL) { + fwts_smbios_entry *mapped_entry; if ((mapped_entry = fwts_mmap((off_t)addr, sizeof(fwts_smbios_entry))) != FWTS_MAP_FAILED) { *entry = *mapped_entry; @@ -80,9 +80,9 @@ static void *fwts_smbios_find_entry_uefi(fwts_framework *fw, fwts_smbios_entry * static void *fwts_smbios30_find_entry_uefi(fwts_framework *fw, fwts_smbios30_entry *entry) { void *addr; - fwts_smbios30_entry *mapped_entry; if ((addr = fwts_scan_efi_systab("SMBIOS3")) != NULL) { + fwts_smbios30_entry *mapped_entry; if ((mapped_entry = fwts_mmap((off_t)addr, sizeof(fwts_smbios30_entry))) != FWTS_MAP_FAILED) { *entry = *mapped_entry;