diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-05-06 17:43:09 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-05-06 17:43:09 +0200 |
| commit | 22f01b438963ac158af3d8066e58ce54be22d2de (patch) | |
| tree | b6f82d7f6a23a39a1bed0e9bad11075b775833ae /erts/emulator/beam/io.c | |
| parent | 5bb42a3018c6d6e1bcaa382db8b873d1cef3c086 (diff) | |
| parent | ea3024202d8dfedfafa62a15286157d3843957cb (diff) | |
| download | otp-22f01b438963ac158af3d8066e58ce54be22d2de.tar.gz otp-22f01b438963ac158af3d8066e58ce54be22d2de.tar.bz2 otp-22f01b438963ac158af3d8066e58ce54be22d2de.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/io.c')
| -rw-r--r-- | erts/emulator/beam/io.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c index 7cadd4aaad..f93b599632 100644 --- a/erts/emulator/beam/io.c +++ b/erts/emulator/beam/io.c @@ -4147,7 +4147,7 @@ port_sig_call(Port *prt, ErlOffHeap *ohp; Process *rp; ErtsProcLocks rp_locks = 0; - Uint hsz; + Sint hsz; rp = erts_proc_lookup_raw(sigdp->caller); if (!rp) @@ -4264,7 +4264,7 @@ erts_port_call(Process* c_p, switch (try_call_res) { case ERTS_TRY_IMM_DRV_CALL_OK: { Eterm *hp, *hp_end; - Uint hsz; + Sint hsz; unsigned ret_flags = 0U; Eterm term; @@ -5941,10 +5941,6 @@ int driver_outputv(ErlDrvPort ix, char* hbuf, ErlDrvSizeT hlen, return driver_output2(ix, hbuf, hlen, NULL, 0); size = vec->size - skip; /* Size of remaining bytes in vector */ - ASSERT(hlen >= 0); /* debug only */ - if (hlen < 0) - hlen = 0; - prt = erts_drvport2port_state(ix, &state); if (prt == ERTS_INVALID_ERL_DRV_PORT) return -1; |