aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/io.c
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-05-06 17:42:58 +0200
committerFredrik Gustafsson <[email protected]>2013-05-06 17:42:58 +0200
commitea3024202d8dfedfafa62a15286157d3843957cb (patch)
tree35e3bb9c80eba604aa7bcd460c657658171cda20 /erts/emulator/beam/io.c
parent60c5ebfa0f56b5e1791b2fd408c243d6a280a393 (diff)
parent691f8f7f180e970aea155d1741cd9f5e66741a20 (diff)
downloadotp-ea3024202d8dfedfafa62a15286157d3843957cb.tar.gz
otp-ea3024202d8dfedfafa62a15286157d3843957cb.tar.bz2
otp-ea3024202d8dfedfafa62a15286157d3843957cb.zip
Merge branch 'nox/fix-warnings/OTP-11086' into maint
* nox/fix-warnings/OTP-11086: Fix some sign warnings found with Clang Fix a shift/reduce conflicts warning in icparse Fix two deprecation warnings in com.ericsson.otp.ic.Environment Define matherr only on platforms where it is used Properly declare _sigaction on Darwin Properly mark Uint literals as unsigned in big.c Do not use -mdynamic-no-pic on Darwin
Diffstat (limited to 'erts/emulator/beam/io.c')
-rw-r--r--erts/emulator/beam/io.c8
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;