diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/simple_file.c | 4 | ||||
| -rw-r--r-- | lib/variables.c | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/lib/simple_file.c b/lib/simple_file.c index 2b823138..b9bafd30 100644 --- a/lib/simple_file.c +++ b/lib/simple_file.c @@ -314,7 +314,7 @@ simple_dir_filter(EFI_HANDLE image, CHAR16 *name, CHAR16 *filter, break; } } - ptr += OFFSET_OF(EFI_FILE_INFO, FileName) + (len + 1)*sizeof(CHAR16); + ptr += offsetof(EFI_FILE_INFO, FileName) + (len + 1)*sizeof(CHAR16); next = ptr; } if (*count) @@ -367,7 +367,7 @@ simple_dir_filter(EFI_HANDLE image, CHAR16 *name, CHAR16 *filter, (*result)[0] = tmp; } - ptr += OFFSET_OF(EFI_FILE_INFO, FileName) + (len + 1)*sizeof(CHAR16); + ptr += offsetof(EFI_FILE_INFO, FileName) + (len + 1)*sizeof(CHAR16); next = ptr; } if (*count == 0) { diff --git a/lib/variables.c b/lib/variables.c index 0abd6a09..044ddae5 100644 --- a/lib/variables.c +++ b/lib/variables.c @@ -74,10 +74,8 @@ CreateTimeBasedPayload(IN OUT UINTN * DataSize, IN OUT UINT8 ** Data) Payload = *Data; PayloadSize = *DataSize; - DescriptorSize = - OFFSET_OF(EFI_VARIABLE_AUTHENTICATION_2, - AuthInfo) + OFFSET_OF(WIN_CERTIFICATE_UEFI_GUID, - CertData); + DescriptorSize = offsetof(EFI_VARIABLE_AUTHENTICATION_2, AuthInfo) + + offsetof(WIN_CERTIFICATE_UEFI_GUID, CertData); NewData = (UINT8 *) AllocateZeroPool(DescriptorSize + PayloadSize); if (NewData == NULL) { return EFI_OUT_OF_RESOURCES; @@ -103,7 +101,7 @@ CreateTimeBasedPayload(IN OUT UINTN * DataSize, IN OUT UINT8 ** Data) CopyMem(&DescriptorData->TimeStamp, &Time, sizeof(EFI_TIME)); DescriptorData->AuthInfo.Hdr.dwLength = - OFFSET_OF(WIN_CERTIFICATE_UEFI_GUID, CertData); + offsetof(WIN_CERTIFICATE_UEFI_GUID, CertData); DescriptorData->AuthInfo.Hdr.wRevision = 0x0200; DescriptorData->AuthInfo.Hdr.wCertificateType = WIN_CERT_TYPE_EFI_GUID; DescriptorData->AuthInfo.CertType = EFI_CERT_TYPE_PKCS7_GUID; |