diff options
| author | Lukas Larsson <[email protected]> | 2014-03-28 10:27:23 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-03-28 10:27:23 +0100 |
| commit | 8d3959c423b79bc8b55c39e039e7ff6517d87212 (patch) | |
| tree | e92561dd9434176661734c8ef2a0807c60f6433f /erts | |
| parent | f558e4a3744333507a92fb8fbbf8dc58a254f05f (diff) | |
| parent | 547aa83f94c6614757e9033849c0c13563930300 (diff) | |
| download | otp-8d3959c423b79bc8b55c39e039e7ff6517d87212.tar.gz otp-8d3959c423b79bc8b55c39e039e7ff6517d87212.tar.bz2 otp-8d3959c423b79bc8b55c39e039e7ff6517d87212.zip | |
Merge branch 'lukas/ose/master-17.0/OTP-11334'
* lukas/ose/master-17.0/OTP-11334:
erts: Move debug printout to eliminate gcc warning
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/drivers/common/inet_drv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c index e33594b026..09bada457d 100644 --- a/erts/emulator/drivers/common/inet_drv.c +++ b/erts/emulator/drivers/common/inet_drv.c @@ -9717,13 +9717,13 @@ static int tcp_remain(tcp_descriptor* desc, int* len) int n = desc->i_ptr - ptr; /* number of bytes read */ int tlen; - DEBUGF(("tcp_remain(%ld): s=%d, n=%d, nfill=%d nsz=%d, tlen %d\r\n", - (long)desc->inet.port, desc->inet.s, n, nfill, nsz, tlen)); - tlen = packet_get_length(desc->inet.htype, ptr, n, desc->inet.psize, desc->i_bufsz, &desc->http_state); + DEBUGF(("tcp_remain(%ld): s=%d, n=%d, nfill=%d nsz=%d, tlen %d\r\n", + (long)desc->inet.port, desc->inet.s, n, nfill, nsz, tlen)); + if (tlen > 0) { if (tlen <= n) { /* got a packet */ *len = tlen; |