diff options
| author | Peter Jones <pjones@redhat.com> | 2021-03-11 16:48:44 -0500 |
|---|---|---|
| committer | Javier Martinez Canillas <javier@dowhile0.org> | 2021-03-12 10:15:01 +0100 |
| commit | 4457d79ce0ea638e7732f5529bf13849e290940d (patch) | |
| tree | 5b931ef8fb3f2a641bc2732eb7821022cc897386 /include/hexdump.h | |
| parent | 3c00db33e53d0cab3b701c1569a79c64878f202d (diff) | |
| download | efi-boot-shim-4457d79ce0ea638e7732f5529bf13849e290940d.tar.gz efi-boot-shim-4457d79ce0ea638e7732f5529bf13849e290940d.zip | |
More va_* work
Be much more explicit about exactly which va_* stuff comes from which
ABI in both shim and gnu-efi. This fixes the problem where we see:
| (null):0:(null)() v->name:"(null)" v->rtname:"(null)"
| (null):0:(null)() v->data_size:0 v->data:0x0
and similar messages where everything is NULL.
Signed-off-by: Peter Jones <pjones@redhat.com>
Diffstat (limited to 'include/hexdump.h')
| -rw-r--r-- | include/hexdump.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/hexdump.h b/include/hexdump.h index f778de9a..381e1a68 100644 --- a/include/hexdump.h +++ b/include/hexdump.h @@ -81,7 +81,7 @@ prepare_text(const void *data, size_t size, char *buf, unsigned int position) */ static inline void UNUSED EFIAPI vhexdumpf(const char *file, int line, const char *func, const CHAR16 *const fmt, - const void *data, unsigned long size, size_t at, va_list ap) + const void *data, unsigned long size, size_t at, ms_va_list ap) { unsigned long display_offset = at; unsigned long offset = 0; @@ -118,11 +118,11 @@ static inline void UNUSED EFIAPI hexdumpf(const char *file, int line, const char *func, const CHAR16 *const fmt, const void *data, unsigned long size, size_t at, ...) { - va_list ap; + ms_va_list ap; - va_start(ap, at); + ms_va_start(ap, at); vhexdumpf(file, line, func, fmt, data, size, at, ap); - va_end(ap); + ms_va_end(ap); } static inline void UNUSED |