8 files changed, 14 insertions, 17 deletions
diff --git a/erts/emulator/beam/beam_bp.c b/erts/emulator/beam/beam_bp.c
index c1e11f6448..9b17de34ec 100644
--- a/erts/emulator/beam/beam_bp.c
+++ b/erts/emulator/beam/beam_bp.c
@@ -969,7 +969,7 @@ erts_trace_time_call(Process* c_p, BeamInstr* I, BpDataTime* bdt)
     if (pbt == 0) {
 	/* First call of process to instrumented function */
 	pbt = Alloc(sizeof(process_breakpoint_time_t));
-	(void *) ERTS_PROC_SET_CALL_TIME(c_p, ERTS_PROC_LOCK_MAIN, pbt);
+	(void) ERTS_PROC_SET_CALL_TIME(c_p, ERTS_PROC_LOCK_MAIN, pbt);
     } else {
 	ASSERT(pbt->pc);
 	/* add time to previous code */
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c
index b51f076a5d..96f506c97c 100644
--- a/erts/emulator/beam/beam_load.c
+++ b/erts/emulator/beam/beam_load.c
@@ -5904,7 +5904,7 @@ erts_make_stub_module(Process* p, Eterm Mod, Eterm Beam, Eterm Info)
 	Eterm* tp;
 	Eterm func;
 	Eterm arity_term;
-	Uint arity;
+	Sint arity;
 	Uint native_address;
 	Eterm op;
 
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 97c8114437..46f297fc4d 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -359,8 +359,7 @@ remote_demonitor(Process *c_p, DistEntry *dep, Eterm ref, Eterm to)
 	break;
     default:
 	ASSERT(! "Invalid dsig prepare result");
-	res = ERTS_DEMONITOR_INTERNAL_ERROR;
-	break;
+	return ERTS_DEMONITOR_INTERNAL_ERROR;
     }
 
 #ifndef ERTS_SMP
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c
index 64cd93a100..98d8481b53 100644
--- a/erts/emulator/beam/dist.c
+++ b/erts/emulator/beam/dist.c
@@ -2548,9 +2548,9 @@ BIF_RETTYPE setnode_2(BIF_ALIST_2)
     /* By setting dist_entry==erts_this_dist_entry and DISTRIBUTION on
        net_kernel do_net_exist will be called when net_kernel
        is terminated !! */
-    (void *) ERTS_PROC_SET_DIST_ENTRY(net_kernel,
-				      ERTS_PROC_LOCK_MAIN,
-				      erts_this_dist_entry);
+    (void) ERTS_PROC_SET_DIST_ENTRY(net_kernel,
+				    ERTS_PROC_LOCK_MAIN,
+				    erts_this_dist_entry);
     erts_refc_inc(&erts_this_dist_entry->refc, 2);
     net_kernel->flags |= F_DISTRIBUTION;
 
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index fabddffc68..3d51c17183 100755
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -3286,7 +3286,7 @@ BIF_RETTYPE erts_debug_get_internal_state_1(BIF_ALIST_1)
 	else if (ERTS_IS_ATOM_STR("next_pid", BIF_ARG_1)
 		 || ERTS_IS_ATOM_STR("next_port", BIF_ARG_1)) {
 	    /* Used by node_container_SUITE (emulator) */
-	    Eterm res;
+	    Sint res;
 	    if (ERTS_IS_ATOM_STR("next_pid", BIF_ARG_1))
 		res = erts_ptab_test_next_id(&erts_proc, 0, 0);
 	    else
@@ -3644,7 +3644,7 @@ BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2)
 	    Uint next;
 
 	    if (term_to_Uint(BIF_ARG_2, &next) != 0) {
-		Eterm res;
+		Sint res;
 
 		if (ERTS_IS_ATOM_STR("next_pid", BIF_ARG_1))
 		    res = erts_ptab_test_next_id(&erts_proc, 1, next);
diff --git a/erts/emulator/beam/erl_instrument.c b/erts/emulator/beam/erl_instrument.c
index 963c8b3c58..7f4349556c 100644
--- a/erts/emulator/beam/erl_instrument.c
+++ b/erts/emulator/beam/erl_instrument.c
@@ -775,8 +775,8 @@ Eterm erts_instr_get_memory_map(Process *proc)
     ASSERT(hp + 3 == end_hp);
 
     if (mem_anchor) {
-	for (bp = mem_anchor; bp->next; bp = bp->next);
-
+	for (bp = mem_anchor; bp->next; bp = bp->next)
+	    ;
 	ASSERT(org_mem_anchor);
 	org_mem_anchor->prev = bp; 
 	bp->next = org_mem_anchor;
diff --git a/erts/emulator/beam/external.c b/erts/emulator/beam/external.c
index ab1065aaa1..126f242fc0 100644
--- a/erts/emulator/beam/external.c
+++ b/erts/emulator/beam/external.c
@@ -926,7 +926,7 @@ BIF_RETTYPE erts_debug_dist_ext_to_term_2(BIF_ALIST_2)
     Eterm res;
     Eterm *hp;
     Eterm *hendp;
-    Uint hsz;
+    Sint hsz;
     ErtsDistExternal ede;
     Eterm *tp;
     Eterm real_bin;
@@ -972,7 +972,7 @@ BIF_RETTYPE erts_debug_dist_ext_to_term_2(BIF_ALIST_2)
     if (hsz < 0)
 	goto badarg;
 
-    hp = HAlloc(BIF_P, hsz);
+    hp = HAlloc(BIF_P, (Uint) hsz);
     hendp = hp + hsz;
 
     res = erts_decode_dist_ext(&hp, &MSO(BIF_P), &ede);
diff --git a/erts/emulator/beam/packet_parser.c b/erts/emulator/beam/packet_parser.c
index f1cfa8df39..1e301e3593 100644
--- a/erts/emulator/beam/packet_parser.c
+++ b/erts/emulator/beam/packet_parser.c
@@ -460,11 +460,9 @@ int packet_get_length(enum PacketParseType htype,
         hp = (struct tpkt_head*) ptr;
         if (hp->vrsn == TPKT_VRSN) {
             plen = get_int16(hp->packet_length) - hlen;
-            if (plen < 0)
-                goto error;
-        }
-        else
+        } else {
             goto error;
+	}
         goto remain;
     }