diff options
| author | Raimo Niskanen <[email protected]> | 2019-07-08 15:38:14 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2019-07-08 15:38:14 +0200 |
| commit | a7dad3b76794210d5158d873ea1421e944a7c053 (patch) | |
| tree | 64249136ee2e4498e8abb6223828f1fc48cbb9a6 /erts/emulator/drivers/common | |
| parent | 4c06ed65cb06f13f836d0d05ac8274557963a6f6 (diff) | |
| parent | 136200e49b7730807d7071af414b28c8aacff759 (diff) | |
| download | otp-a7dad3b76794210d5158d873ea1421e944a7c053.tar.gz otp-a7dad3b76794210d5158d873ea1421e944a7c053.tar.bz2 otp-a7dad3b76794210d5158d873ea1421e944a7c053.zip | |
Merge branch 'maint'
* maint:
Refine test cases
Remove test code that fails on Windows
Diffstat (limited to 'erts/emulator/drivers/common')
| -rw-r--r-- | erts/emulator/drivers/common/inet_drv.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c index 311c5fdd6a..66ff8d8450 100644 --- a/erts/emulator/drivers/common/inet_drv.c +++ b/erts/emulator/drivers/common/inet_drv.c @@ -12733,7 +12733,7 @@ static void packet_inet_command(ErlDrvData e, char* buf, ErlDrvSizeT len) len -= 4; ptr += 4; if (len < anc_len) goto return_einval; - if (anc_len == 0 && !!0/*XXX-short-circuit-for-testing*/) { + if (anc_len == 0) { /* Empty ancillary data */ /* Now "ptr" is the user data ptr, "len" is data length: */ inet_output_count(desc, len); @@ -12772,10 +12772,7 @@ static void packet_inet_command(ErlDrvData e, char* buf, ErlDrvSizeT len) if (compile_ancillary_data(&mhdr, ptr, anc_len) != 0) { goto return_einval; } - if (mhdr.msg_controllen == 0) { - /* XXX Testing - only possible for anc_len == 0 */ - mhdr.msg_control = NULL; - } + ASSERT(mhdr.msg_controllen != 0); len -= anc_len; ptr += anc_len; /* Now "ptr" is the user data ptr, "len" is data length: */ |