diff options
| author | Sverker Eriksson <[email protected]> | 2013-12-20 14:25:03 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-12-20 14:25:35 +0100 |
| commit | 1e4f6c5e85a821333dc1cea38d057fb92547e160 (patch) | |
| tree | 26a0075dce302f2d3dd025d4b1c17494b5c0cb7a /erts/emulator/drivers | |
| parent | 6f0b3bd3fc28de703490470630922873775c97f5 (diff) | |
| parent | 21408235bd6915001cbc5051a1b7c38a3fef9d05 (diff) | |
| download | otp-1e4f6c5e85a821333dc1cea38d057fb92547e160.tar.gz otp-1e4f6c5e85a821333dc1cea38d057fb92547e160.tar.bz2 otp-1e4f6c5e85a821333dc1cea38d057fb92547e160.zip | |
Merge branch 'sverk/unicode-driver-paths'
OTP-11549
* sverk/unicode-driver-paths:
erts: Support loading of drivers with unicode paths
erts: Add 'extra' argument to erts_convert_filename_to_encoding
erts: Refactor remove erts_sys_dll_open2
erts: Fix compiler warning
Diffstat (limited to 'erts/emulator/drivers')
| -rw-r--r-- | erts/emulator/drivers/common/inet_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c index 978a766de9..80937dfcc8 100644 --- a/erts/emulator/drivers/common/inet_drv.c +++ b/erts/emulator/drivers/common/inet_drv.c @@ -1490,8 +1490,8 @@ static int load_ip_and_port unsigned int alen = len; char abuf [len]; int res = inet_get_address(abuf, (inet_address*) addr, &alen); - ASSERT(res==0); - res = 0; + ASSERT(res==0); (void)res; + /* Now "abuf" contains: Family(1b), Port(2b), IP(4|16b) */ /* NB: the following functions are safe to use, as they create tuples |