aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-05-06 12:00:03 +0200
committerHenrik Nord <[email protected]>2011-05-06 12:00:08 +0200
commit3269ff93e20ea68162c9d38c300758feb0c48f10 (patch)
tree7f9a4d5dcb554e4235586343720efa9a69705b25
parent3bc88daccddc4be0a834da18ef0cb35529dcf383 (diff)
parent1a0389b3cc789bab6264777f27abc2674908543d (diff)
downloadotp-3269ff93e20ea68162c9d38c300758feb0c48f10.tar.gz
otp-3269ff93e20ea68162c9d38c300758feb0c48f10.tar.bz2
otp-3269ff93e20ea68162c9d38c300758feb0c48f10.zip
Merge branch 'ta/inet_drv-cleanup' into dev
* ta/inet_drv-cleanup: inet_drv: remove unused tcp request id inet_drv: remove gratuitous assignment OTP-9263
-rw-r--r--erts/emulator/drivers/common/inet_drv.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index 59f4cfb9b4..aec456151c 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -490,7 +490,6 @@ static int my_strncasecmp(const char *s1, const char *s2, size_t n)
#define TCP_REQ_RECV 42
#define TCP_REQ_UNRECV 43
#define TCP_REQ_SHUTDOWN 44
-#define TCP_REQ_MULTI_OP 45
/* UDP and SCTP requests */
#define PACKET_REQ_RECV 60 /* Common for UDP and SCTP */
#define SCTP_REQ_LISTEN 61 /* Different from TCP; not for UDP */
@@ -1763,7 +1762,6 @@ send_async_error(ErlDrvPort port, ErlDrvTermData Port, int Ref,
LOAD_INT_CNT + 2*LOAD_TUPLE_CNT];
int i = 0;
- i = 0;
i = LOAD_ATOM(spec, i, am_inet_async);
i = LOAD_PORT(spec, i, Port);
i = LOAD_INT(spec, i, Ref);