Merging upstream version 1.7.1.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
41144a7301
commit
476f38f2bb
878 changed files with 2965 additions and 1746 deletions
|
@ -75,10 +75,12 @@ void end_mock_cmds(void)
|
|||
check((cmd)->metadata_len == (mock_cmd)->metadata_len, \
|
||||
"got metadata_len %" PRIu32 ", expected %" PRIu32, \
|
||||
(cmd)->metadata_len, (mock_cmd)->metadata_len); \
|
||||
cmp((void const *)(uintptr_t)(cmd)->metadata, \
|
||||
(mock_cmd)->metadata, \
|
||||
(cmd)->metadata_len, \
|
||||
"incorrect metadata"); \
|
||||
if ((cmd)->metadata_len) { \
|
||||
cmp((void const *)(uintptr_t)(cmd)->metadata, \
|
||||
(mock_cmd)->metadata, \
|
||||
(cmd)->metadata_len, \
|
||||
"incorrect metadata"); \
|
||||
} \
|
||||
__u32 data_len = (cmd)->data_len; \
|
||||
check(data_len == (mock_cmd)->data_len, \
|
||||
"got data_len %" PRIu32 ", expected %" PRIu32, \
|
||||
|
@ -114,7 +116,11 @@ void end_mock_cmds(void)
|
|||
} \
|
||||
})
|
||||
|
||||
#ifdef HAVE_GLIBC_IOCTL
|
||||
int ioctl(int fd, unsigned long request, ...)
|
||||
#else
|
||||
int ioctl(int fd, int request, ...)
|
||||
#endif
|
||||
{
|
||||
struct mock_cmds *mock_cmds;
|
||||
bool result64;
|
||||
|
@ -141,7 +147,7 @@ int ioctl(int fd, unsigned long request, ...)
|
|||
result64 = true;
|
||||
break;
|
||||
default:
|
||||
fail("unexpected %s %lu", __func__, request);
|
||||
fail("unexpected %s %lu", __func__, (unsigned long) request);
|
||||
}
|
||||
check(mock_cmds->remaining_cmds,
|
||||
"unexpected %s command", mock_cmds->name);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue