From 691f8f7f180e970aea155d1741cd9f5e66741a20 Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Sun, 28 Apr 2013 13:50:27 +0200
Subject: Fix some sign warnings found with Clang

---
 erts/emulator/beam/beam_load.c     | 14 +++++++-------
 erts/emulator/beam/erl_bif_trace.c |  4 +---
 erts/emulator/beam/io.c            |  8 ++------
 3 files changed, 10 insertions(+), 16 deletions(-)

(limited to 'erts/emulator')

diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c
index bd4e5a52d0..4193eb4f3f 100644
--- a/erts/emulator/beam/beam_load.c
+++ b/erts/emulator/beam/beam_load.c
@@ -2964,19 +2964,19 @@ gen_put_integer(LoaderState* stp, GenOpArg Fail, GenOpArg Size,
     NEW_GENOP(stp, op);
 
     NATIVE_ENDIAN(Flags);
-    if (Size.type == TAG_i && Size.val < 0) {
-    error:
 	/* Negative size must fail */
-	op->op = genop_badarg_1;
-	op->arity = 1;
-	op->a[0] = Fail;
-    } else if (Size.type == TAG_i) {
+    if (Size.type == TAG_i) {
 	op->op = genop_i_new_bs_put_integer_imm_4;
 	op->arity = 4;
 	op->a[0] = Fail;
 	op->a[1].type = TAG_u;
 	if (!safe_mul(Size.val, Unit.val, &op->a[1].val)) {
-	    goto error;
+        error:
+            op->op = genop_badarg_1;
+            op->arity = 1;
+            op->a[0] = Fail;
+            op->next = NULL;
+            return op;
 	}
 	op->a[1].val = Size.val * Unit.val;
 	op->a[2].type = Flags.type;
diff --git a/erts/emulator/beam/erl_bif_trace.c b/erts/emulator/beam/erl_bif_trace.c
index 41c98bbffb..559cb3efa1 100644
--- a/erts/emulator/beam/erl_bif_trace.c
+++ b/erts/emulator/beam/erl_bif_trace.c
@@ -1224,9 +1224,7 @@ trace_info_func(Process* p, Eterm func_spec, Eterm key)
 		match_spec_meta = NIL;
 	}
 	if (r & FUNC_TRACE_COUNT_TRACE) {
-	    c = count < 0 ? 
-		erts_make_integer(-count-1, p) : 
-		erts_make_integer(count, p);
+	    c = erts_make_integer(count, p);
 	}
 	if (r & FUNC_TRACE_TIME_TRACE) {
 	    ct = call_time;
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;
-- 
cgit v1.2.3