diff options
| author | Anastasia Klimchuk <aklm@chromium.org> | 2022-10-17 11:59:09 +1100 |
|---|---|---|
| committer | Anastasia Klimchuk <aklm@chromium.org> | 2022-11-08 21:09:42 +0000 |
| commit | af2ba601f4840172eb422a0f3efb5a740fb9698d (patch) | |
| tree | bafcf8a04415c6833e099d1b932bb52a2dbfe550 /tests/io_mock.h | |
| parent | 0a896424abd490d1cfdd8a582ba17c25df75a0e0 (diff) | |
| download | flashrom-af2ba601f4840172eb422a0f3efb5a740fb9698d.tar.gz flashrom-af2ba601f4840172eb422a0f3efb5a740fb9698d.tar.bz2 flashrom-af2ba601f4840172eb422a0f3efb5a740fb9698d.zip | |
tests: Add prefix to io_mock functions not to clash with macros
Flashrom I/O mock functions need to be renamed so that they do not
have name clash with standard I/O, because the latter are allowed
to be macros. Adding a prefix to flashrom mock functions avoids
them being accidentally expanded. Standard I/O functions are
expanded and flashrom mocks stay as they are.
BUG=b:237606255
TEST=ninja test
1) gcc 12.2.0 on Debian
2) clang 15.0 on Chromium OS
Ticket: https://ticket.coreboot.org/issues/411
Change-Id: I7998a8fb1b9e65621e12adbfab5460a245d5606b
Signed-off-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/68433
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
Diffstat (limited to 'tests/io_mock.h')
| -rw-r--r-- | tests/io_mock.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/io_mock.h b/tests/io_mock.h index 9e92a9d3..644da74a 100644 --- a/tests/io_mock.h +++ b/tests/io_mock.h @@ -101,17 +101,17 @@ struct io_mock { void (*libusb_free_config_descriptor)(void *state, struct libusb_config_descriptor *); /* POSIX File I/O */ - int (*open)(void *state, const char *pathname, int flags); - int (*ioctl)(void *state, int fd, unsigned long request, va_list args); - int (*read)(void *state, int fd, void *buf, size_t sz); - int (*write)(void *state, int fd, const void *buf, size_t sz); + int (*iom_open)(void *state, const char *pathname, int flags); + int (*iom_ioctl)(void *state, int fd, unsigned long request, va_list args); + int (*iom_read)(void *state, int fd, void *buf, size_t sz); + int (*iom_write)(void *state, int fd, const void *buf, size_t sz); /* Standard I/O */ - FILE* (*fopen)(void *state, const char *pathname, const char *mode); - char* (*fgets)(void *state, char *buf, int len, FILE *fp); - size_t (*fread)(void *state, void *buf, size_t size, size_t len, FILE *fp); - int (*fprintf)(void *state, FILE *fp, const char *fmt, va_list args); - int (*fclose)(void *state, FILE *fp); + FILE* (*iom_fopen)(void *state, const char *pathname, const char *mode); + char* (*iom_fgets)(void *state, char *buf, int len, FILE *fp); + size_t (*iom_fread)(void *state, void *buf, size_t size, size_t len, FILE *fp); + int (*iom_fprintf)(void *state, FILE *fp, const char *fmt, va_list args); + int (*iom_fclose)(void *state, FILE *fp); /* * An alternative to custom open mock. A test can either register its |