Merge branch 'maint'

* maint:
  erts: Use re instead of regexp in testsuite
  erts: Remove unused code in testsuites
  orber: Use modern list guard in testsuite
  orber: Ignore unused variable in orber_tb.erl
  xmerl: Ignore unused variable in xmerl_uri.erl
  syntax_tool: Add missing type information
  hipe: Suppress warnings for unused variables
  hipe: Add type information to cfg_info record
  tools: Use literal formatting in erl_memory.c
  asn1: Remove unused variable in asn1_erl_nif.c
  ei: Remove unused variable in ei_format.c
  erts: Add missing prototype to DRIVER_INIT
  runtime_tools: Fix signedness in trace_ip_drv.c
  to_erl: Remove compiler warnings
  heart: Suppress compiler warnings
  erts: Remove compiler warnings in inet_gethost.c
  erts: Remove dead code in inet_gethost.c
  erts: Remove dead code

18 files changed, 121 insertions, 83 deletions

diff --git a/erts/emulator/beam/erl_driver.h b/erts/emulator/beam/erl_driver.h
index e80eae0b86..7510f6b724 100644
--- a/erts/emulator/beam/erl_driver.h
+++ b/erts/emulator/beam/erl_driver.h
@@ -371,11 +371,17 @@ typedef struct erl_drv_entry {
 #ifndef ERL_DRIVER_TYPES_ONLY
 
 #if defined(VXWORKS)
-#  define DRIVER_INIT(DRIVER_NAME) ErlDrvEntry* DRIVER_NAME  ## _init(void)
+#  define DRIVER_INIT(DRIVER_NAME) \
+    ErlDrvEntry* DRIVER_NAME  ## _init(void); \
+    ErlDrvEntry* DRIVER_NAME  ## _init(void)
 #elif defined(__WIN32__)
-#  define DRIVER_INIT(DRIVER_NAME) __declspec(dllexport) ErlDrvEntry* driver_init(void)
+#  define DRIVER_INIT(DRIVER_NAME) \
+    __declspec(dllexport) ErlDrvEntry* driver_init(void); \
+    __declspec(dllexport) ErlDrvEntry* driver_init(void)
 #else 
-#  define DRIVER_INIT(DRIVER_NAME) ErlDrvEntry* driver_init(void)
+#  define DRIVER_INIT(DRIVER_NAME) \
+    ErlDrvEntry* driver_init(void); \
+    ErlDrvEntry* driver_init(void)
 #endif
 
 /*
diff --git a/erts/emulator/beam/erl_port_task.c b/erts/emulator/beam/erl_port_task.c
index 2b5e65b11a..a2b08fcf56 100644
--- a/erts/emulator/beam/erl_port_task.c
+++ b/erts/emulator/beam/erl_port_task.c
@@ -731,7 +731,6 @@ erts_port_task_execute(ErtsRunQueue *runq, Port **curr_port_pp)
     int reds = ERTS_PORT_REDS_EXECUTE;
     erts_aint_t io_tasks_executed = 0;
     int fpe_was_unmasked;
-    ErtsPortTaskExeBlockData blk_data = {runq, NULL};
 
     ERTS_SMP_LC_ASSERT(erts_smp_lc_runq_is_locked(runq));
 
@@ -965,8 +964,6 @@ erts_port_task_execute(ErtsRunQueue *runq, Port **curr_port_pp)
 #endif
 
  done:
-    blk_data.resp = &res;
-
     ERTS_SMP_LC_ASSERT(erts_smp_lc_runq_is_locked(runq));
 
     ERTS_PORT_REDUCTIONS_EXECUTED(runq, reds);
diff --git a/erts/emulator/hipe/hipe_bif0.c b/erts/emulator/hipe/hipe_bif0.c
index cec22b3836..28e4382835 100644
--- a/erts/emulator/hipe/hipe_bif0.c
+++ b/erts/emulator/hipe/hipe_bif0.c
@@ -174,8 +174,13 @@ static inline unsigned char *bytearray_lvalue(Eterm bin, Eterm idx)
 {
     Sint i;
     unsigned char *bytes;
+#ifndef DEBUG
+    ERTS_DECLARE_DUMMY(Uint bitoffs);
+    ERTS_DECLARE_DUMMY(Uint bitsize);
+#else
     Uint bitoffs;
     Uint bitsize;
+#endif
 
     if (is_not_binary(bin) ||
 	is_not_small(idx) ||
@@ -235,9 +240,15 @@ BIF_RETTYPE hipe_bifs_bitarray_2(BIF_ALIST_2)
 BIF_RETTYPE hipe_bifs_bitarray_update_3(BIF_ALIST_3)
 {
     unsigned char *bytes, bytemask;
-    Uint bitoffs, bitsize;
     Uint bitnr, bytenr;
     int set;
+#ifndef DEBUG
+    ERTS_DECLARE_DUMMY(Uint bitoffs);
+    ERTS_DECLARE_DUMMY(Uint bitsize);
+#else
+    Uint bitoffs;
+    Uint bitsize;
+#endif
 
     if (is_not_binary(BIF_ARG_1))
 	BIF_ERROR(BIF_P, BADARG);
@@ -267,8 +278,15 @@ BIF_RETTYPE hipe_bifs_bitarray_update_3(BIF_ALIST_3)
 BIF_RETTYPE hipe_bifs_bitarray_sub_2(BIF_ALIST_2)
 {
     unsigned char *bytes, bytemask;
-    Uint bitoffs, bitsize;
     Uint bitnr, bytenr;
+#ifndef DEBUG
+    ERTS_DECLARE_DUMMY(Uint bitoffs);
+    ERTS_DECLARE_DUMMY(Uint bitsize);
+#else
+    Uint bitoffs;
+    Uint bitsize;
+#endif
+
 
     if (is_not_binary(BIF_ARG_1))
 	BIF_ERROR(BIF_P, BADARG);
@@ -397,10 +415,15 @@ BIF_RETTYPE hipe_bifs_enter_code_2(BIF_ALIST_2)
     Uint nrbytes;
     void *bytes;
     void *address;
-    Uint bitoffs;
-    Uint bitsize;
     Eterm trampolines;
     Eterm *hp;
+#ifndef DEBUG
+    ERTS_DECLARE_DUMMY(Uint bitoffs);
+    ERTS_DECLARE_DUMMY(Uint bitsize);
+#else
+    Uint bitoffs;
+    Uint bitsize;
+#endif
 
     if (is_not_binary(BIF_ARG_1))
 	BIF_ERROR(BIF_P, BADARG);
diff --git a/erts/etc/common/heart.c b/erts/etc/common/heart.c
index 7a5746e630..fae4d870cc 100644
--- a/erts/etc/common/heart.c
+++ b/erts/etc/common/heart.c
@@ -685,14 +685,16 @@ do_terminate(reason)
 	  print_error("Would reboot. Terminating.");
 	else {
 	  kill_old_erlang();
-	  system(command);
+	  /* suppress gcc warning with 'if' */
+	  if(system(command));
 	  print_error("Executed \"%s\". Terminating.",command);
 	}
 	free_env_val(command);
       }
       else {
 	kill_old_erlang();
-	system((char*)&cmd[0]);
+	/* suppress gcc warning with 'if' */
+	if(system((char*)&cmd[0]));
 	print_error("Executed \"%s\". Terminating.",cmd);
       }
     }
diff --git a/erts/etc/common/inet_gethost.c b/erts/etc/common/inet_gethost.c
index 77bfd5e2bc..d25d2910b4 100644
--- a/erts/etc/common/inet_gethost.c
+++ b/erts/etc/common/inet_gethost.c
@@ -1141,14 +1141,12 @@ static Worker *pick_worker(void)
 static Worker *pick_worker_greedy(AddrByte *domainbuff)
 {
     int i;
-    int ql = 0;
     int found = -1;
     for (i=0; i < num_busy_workers; ++i) {
 	if (domaineq(busy_workers[i].domain, domainbuff)) {
 	    if ((found < 0) || (busy_workers[i].que_size < 
 				busy_workers[found].que_size)) {
 		found = i;
-		ql = busy_workers[i].que_size;
 	    }
 	}
     }
@@ -1945,12 +1943,14 @@ static int worker_loop(void)
 	}
 	m = NULL;
 #else
-	write(1, reply, data_size); /* No signals expected */
+	/* expect no signals */
+	if (write(1, reply, data_size) < 0)
+	    goto fail;
 #endif
     } /* for (;;) */
 
-#ifdef WIN32
  fail:
+#ifdef WIN32
     if (m != NULL) {
 	FREE(m);
     }
@@ -1959,8 +1959,8 @@ static int worker_loop(void)
     if (reply) {
 	FREE(reply);
     }
-    return 1;
 #endif
+    return 1;
 }
 
 static int map_netdb_error(int netdb_code)
@@ -2561,7 +2561,8 @@ static void debugf(char *format, ...)
 	WriteFile(debug_console_allocated,buff,strlen(buff),&res,NULL);
     }
 #else
-    write(2,buff,strlen(buff));
+    /* suppress warning with 'if' */
+    if(write(2,buff,strlen(buff)));
 #endif
     va_end(ap);
 }
@@ -2583,7 +2584,8 @@ static void warning(char *format, ...)
 	WriteFile(GetStdHandle(STD_ERROR_HANDLE),buff,strlen(buff),&res,NULL);
     }
 #else
-    write(2,buff,strlen(buff));
+    /* suppress warning with 'if' */
+    if(write(2,buff,strlen(buff)));
 #endif
     va_end(ap);
 }
@@ -2605,7 +2607,8 @@ static void fatal(char *format, ...)
 	WriteFile(GetStdHandle(STD_ERROR_HANDLE),buff,strlen(buff),&res,NULL);
     }
 #else
-    write(2,buff,strlen(buff));
+    /* suppress warning with 'if' */
+    if(write(2,buff,strlen(buff)));
 #endif
     va_end(ap);
 #ifndef WIN32
diff --git a/erts/etc/unix/to_erl.c b/erts/etc/unix/to_erl.c
index 11fa3ff4cc..67274e67ed 100644
--- a/erts/etc/unix/to_erl.c
+++ b/erts/etc/unix/to_erl.c
@@ -352,7 +352,10 @@ int main(int argc, char **argv)
      * to trigger the version handshaking between to_erl and run_erl
      * at the start of every new to_erl-session.
      */
-    write(wfd, "\022", 1);
+
+    if (write(wfd, "\022", 1) < 0) {
+	fprintf(stderr, "Error in writing ^R to FIFO.\n");
+    }
 
     /*
      * read and write
@@ -412,7 +415,7 @@ int main(int argc, char **argv)
 
 	if (len) {
 #ifdef DEBUG
-	    write(1, buf, len);
+	    if(write(1, buf, len));
 #endif
 	    if (write_all(wfd, buf, len) != len) {
 		fprintf(stderr, "Error in writing to FIFO.\n");
diff --git a/erts/test/erl_print_SUITE.erl b/erts/test/erl_print_SUITE.erl
index ee1a200530..adc353bd51 100644
--- a/erts/test/erl_print_SUITE.erl
+++ b/erts/test/erl_print_SUITE.erl
@@ -303,7 +303,7 @@ read_case_data(Port, TestCase) ->
 	      {Port, {data, {eol, [?PID_MARKER | PidStr]}}} ->
 		  ?line ?t:format("Port program pid: ~s~n", [PidStr]),
 		  ?line CaseProc = self(),
-		  ?line list_to_integer(PidStr), % Sanity check
+		  ?line _ = list_to_integer(PidStr), % Sanity check
 		  spawn_opt(fun () ->
 				    port_prog_killer(CaseProc, PidStr)
 			    end,
diff --git a/erts/test/ethread_SUITE.erl b/erts/test/ethread_SUITE.erl
index 80f988b0aa..5bb5aed3ed 100644
--- a/erts/test/ethread_SUITE.erl
+++ b/erts/test/ethread_SUITE.erl
@@ -68,9 +68,6 @@ tests() ->
      atomic,
      dw_atomic_massage].
 
-all(doc) -> [];
-all(suite) -> tests().
-
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
@@ -125,35 +122,37 @@ try_lock_mutex(suite) ->
 try_lock_mutex(Config) ->
     run_case(Config, "try_lock_mutex", "").
 
-wd_dispatch(P) ->
-    receive
-	bye ->
-	    ?line true = port_command(P, "-1 "),
-	    ?line bye;
-	L when is_list(L) ->
-	    ?line true = port_command(P, L),
-	    ?line wd_dispatch(P)
-    end.
-
-watchdog(Port) ->
-    ?line process_flag(priority, max),
-    ?line receive after 500 -> ok end,
-
-    ?line random:seed(),
-    ?line true = port_command(Port, "0 "),
-    ?line lists:foreach(fun (T) ->
-				erlang:send_after(T,
-						  self(),
-						  integer_to_list(T)
-						  ++ " ")
-			end,
-			lists:usort(lists:map(fun (_) ->
-						      random:uniform(4500)+500
-					      end,
-					      lists:duplicate(50,0)))),
-    ?line erlang:send_after(5100, self(), bye),
-
-    wd_dispatch(Port).
+%% Remove dead code?
+
+% wd_dispatch(P) ->
+%     receive
+% 	bye ->
+% 	    ?line true = port_command(P, "-1 "),
+% 	    ?line bye;
+% 	L when is_list(L) ->
+% 	    ?line true = port_command(P, L),
+% 	    ?line wd_dispatch(P)
+%     end.
+% 
+% watchdog(Port) ->
+%     ?line process_flag(priority, max),
+%     ?line receive after 500 -> ok end,
+% 
+%     ?line random:seed(),
+%     ?line true = port_command(Port, "0 "),
+%     ?line lists:foreach(fun (T) ->
+% 				erlang:send_after(T,
+% 						  self(),
+% 						  integer_to_list(T)
+% 						  ++ " ")
+% 			end,
+% 			lists:usort(lists:map(fun (_) ->
+% 						      random:uniform(4500)+500
+% 					      end,
+% 					      lists:duplicate(50,0)))),
+%     ?line erlang:send_after(5100, self(), bye),
+% 
+%     wd_dispatch(Port).
 
 cond_wait(doc) ->
     ["Tests ethr_cond_wait with ethr_cond_signal and ethr_cond_broadcast."];
@@ -307,7 +306,7 @@ read_case_data(Port, TestCase) ->
 	      {Port, {data, {eol, [?PID_MARKER | PidStr]}}} ->
 		  ?line ?t:format("Port program pid: ~s~n", [PidStr]),
 		  ?line CaseProc = self(),
-		  ?line list_to_integer(PidStr), % Sanity check
+		  ?line _ = list_to_integer(PidStr), % Sanity check
 		  spawn_opt(fun () ->
 				    port_prog_killer(CaseProc, PidStr)
 			    end,
diff --git a/erts/test/z_SUITE.erl b/erts/test/z_SUITE.erl
index 482ecb8fba..28da923497 100644
--- a/erts/test/z_SUITE.erl
+++ b/erts/test/z_SUITE.erl
@@ -236,8 +236,8 @@ format_core(#core_search_conf{file = false}, Core, Ignore) ->
 	      [Ignore, Core] ++ mod_time_list(Core));
 format_core(#core_search_conf{file = File}, Core, Ignore) ->
     FRes = str_strip(os:cmd(File ++ " " ++ Core)),
-    case catch regexp:match(FRes, Core) of
-	{match, _, _} ->
+    case catch re:run(FRes, Core, [caseless,{capture,none}]) of
+	match ->
 	    io:format("  ~s~s " ++ time_fstr() ++ "~n",
 		      [Ignore, FRes] ++ mod_time_list(Core));
 	_ ->
diff --git a/lib/asn1/c_src/asn1_erl_nif.c b/lib/asn1/c_src/asn1_erl_nif.c
index 9c9f83bc2a..accd368af1 100644
--- a/lib/asn1/c_src/asn1_erl_nif.c
+++ b/lib/asn1/c_src/asn1_erl_nif.c
@@ -580,7 +580,7 @@ int per_insert_bits_as_bits(int desired_no, int no_bytes,
 	unsigned char **input_ptr, unsigned char **output_ptr, int *unused) {
     unsigned char *in_ptr = *input_ptr;
     unsigned char val;
-    int no_bits, ret, ret2;
+    int no_bits, ret;
 
     if (desired_no == (no_bytes * 8)) {
 	if (per_insert_octets_unaligned(no_bytes, &in_ptr, output_ptr, *unused)
@@ -606,8 +606,7 @@ int per_insert_bits_as_bits(int desired_no, int no_bytes,
 		== ASN1_ERROR
 		)
 	    return ASN1_ERROR;
-	ret2 = per_pad_bits(desired_no - (no_bytes * 8), output_ptr, unused);
-	/*     printf("ret2 = %d\n\r",ret2); */
+	per_pad_bits(desired_no - (no_bytes * 8), output_ptr, unused);
 	ret = CEIL(desired_no,8);
 	/*     printf("ret = %d\n\r",ret); */
     }
diff --git a/lib/erl_interface/src/misc/ei_format.c b/lib/erl_interface/src/misc/ei_format.c
index cf50f12451..c1e5d998e4 100644
--- a/lib/erl_interface/src/misc/ei_format.c
+++ b/lib/erl_interface/src/misc/ei_format.c
@@ -149,7 +149,7 @@ static int pdigit(const char** fmt, ei_x_buff* x)
 {
     const char* start = *fmt;
     char c;
-    int len, dotp=0;
+    int dotp=0;
     double d;
     long l;
 
@@ -166,7 +166,6 @@ static int pdigit(const char** fmt, ei_x_buff* x)
 	    break;
     } 
     --(*fmt);
-    len = *fmt - start;
     if (dotp) {
 	sscanf(start, "%lf", &d);
 	return ei_x_encode_double(x, d);
diff --git a/lib/hipe/flow/cfg.hrl b/lib/hipe/flow/cfg.hrl
index 62f47a707a..79fe6162ad 100644
--- a/lib/hipe/flow/cfg.hrl
+++ b/lib/hipe/flow/cfg.hrl
@@ -36,8 +36,9 @@
                    is_closure    :: boolean(),
                    closure_arity :: arity(),
                    is_leaf       :: boolean(),
-                   params,     % :: list()
-                   info = []}).  %% this field seems not needed; take out??
+		   params        :: any(),    %% any() since type information is missing?
+		   info = []     :: list()    %% this field seems not needed; take out??
+	       }).
 
 %%
 %% Data is a triple with a dict of constants, a list of labels and an integer
diff --git a/lib/orber/src/orber_tb.erl b/lib/orber/src/orber_tb.erl
index eee67296d7..d3e3a8497d 100644
--- a/lib/orber/src/orber_tb.erl
+++ b/lib/orber/src/orber_tb.erl
@@ -209,7 +209,7 @@ check_illegal_tcp_options([binary |T], IllegalOpts) ->
     check_illegal_tcp_options(T,[binary |IllegalOpts]);
 check_illegal_tcp_options([{reuseaddr, V} |T], IllegalOpts) ->
     check_illegal_tcp_options(T,[{reuseaddr, V} |IllegalOpts]);
-check_illegal_tcp_options([H|T], IllegalOpts) ->
+check_illegal_tcp_options([_H|T], IllegalOpts) ->
     check_illegal_tcp_options(T, IllegalOpts).
 
 %%----------------------------------------------------------------------
diff --git a/lib/orber/test/orber_acl_SUITE.erl b/lib/orber/test/orber_acl_SUITE.erl
index b43a00be19..49107cde84 100644
--- a/lib/orber/test/orber_acl_SUITE.erl
+++ b/lib/orber/test/orber_acl_SUITE.erl
@@ -80,7 +80,7 @@ end_per_group(_GroupName, Config) ->
 %%-----------------------------------------------------------------
 init_per_suite(Config) ->
     if
-        list(Config) ->
+        is_list(Config) ->
             Config;
         true ->
             exit("Config not a list")
diff --git a/lib/runtime_tools/c_src/trace_ip_drv.c b/lib/runtime_tools/c_src/trace_ip_drv.c
index 5396b8afa9..7ae6c1b329 100644
--- a/lib/runtime_tools/c_src/trace_ip_drv.c
+++ b/lib/runtime_tools/c_src/trace_ip_drv.c
@@ -212,11 +212,11 @@ static TraceIpData *lookup_data_by_port(int portno);
 static int set_nonblocking(SOCKET sock);
 static TraceIpMessage *make_buffer(int datasiz, unsigned char op, 
 				   unsigned number);
-static void enque_message(TraceIpData *data, unsigned char *buff, int bufflen,
+static void enque_message(TraceIpData *data, char *buff, int bufflen,
 			  int byteswritten);
 static void clean_que(TraceIpData *data);
 static void close_client(TraceIpData *data);
-static int trywrite(TraceIpData *data, unsigned char *buff, int bufflen);
+static int trywrite(TraceIpData *data, char *buff, int bufflen);
 static SOCKET my_accept(SOCKET sock);
 static void close_unlink_port(TraceIpData *data);
 enum MySelectOp { SELECT_ON, SELECT_OFF, SELECT_CLOSE };
@@ -518,7 +518,7 @@ static void trace_ip_ready_output(ErlDrvData handle, ErlDrvEvent fd)
     tim = data->que[data->questart];
     towrite = tim->siz - tim->written;
     while((res = write_until_done(data->fd, 
-				  tim->bin + tim->written, towrite)) 
+				  (char *)tim->bin + tim->written, towrite))
 	  == towrite) {
 	driver_free(tim);
 	data->que[data->questart] = NULL;
@@ -561,7 +561,7 @@ static ErlDrvSSizeT trace_ip_control(ErlDrvData handle,
 	TraceIpData *data = (TraceIpData *) handle;
 	ErlDrvBinary *b = my_alloc_binary(3);
 	b->orig_bytes[0] = '\0'; /* OK */
-	put_be16(data->listen_portno, &(b->orig_bytes[1]));
+	put_be16(data->listen_portno, (unsigned char *)&(b->orig_bytes[1]));
 	*res = void_ptr = b;
 	return 0;
     } 
@@ -696,7 +696,7 @@ static TraceIpMessage *make_buffer(int datasiz, unsigned char op,
 ** Add message to que, discarding in a politically correct way...
 ** The FLAG_DROP_OLDEST is currently ingored...
 */
-static void enque_message(TraceIpData *data, unsigned char *buff, int bufflen,
+static void enque_message(TraceIpData *data, char *buff, int bufflen,
 			  int byteswritten)
 {
     int diff = data->questop - data->questart;
@@ -763,13 +763,13 @@ static void close_client(TraceIpData *data)
 ** Try to write a message from erlang directly (only called when que is empty 
 ** and client is connected)
 */
-static int trywrite(TraceIpData *data, unsigned char *buff, int bufflen)
+static int trywrite(TraceIpData *data, char *buff, int bufflen)
 {
-    unsigned char op[5];
+    char op[5];
     int res;
 
     op[0] = OP_BINARY;
-    put_be32(bufflen, op + 1);
+    put_be32(bufflen, (unsigned char *)op + 1);
 
     if ((res = write_until_done(data->fd, op, 5)) < 0) {
 	close_client(data);
@@ -793,7 +793,11 @@ static int trywrite(TraceIpData *data, unsigned char *buff, int bufflen)
 static SOCKET my_accept(SOCKET sock)
 {
     struct sockaddr_in sin;
-    int sin_size = sizeof(sin);
+#ifdef HAVE_SOCKLEN_T
+    socklen_t sin_size = sizeof(sin);
+#else
+    int sin_size = (int) sizeof(sin);
+#endif
 
     return accept(sock, (struct sockaddr *) &sin, &sin_size);
 }
diff --git a/lib/syntax_tools/src/erl_syntax.erl b/lib/syntax_tools/src/erl_syntax.erl
index 7f58fda519..4e2235d552 100644
--- a/lib/syntax_tools/src/erl_syntax.erl
+++ b/lib/syntax_tools/src/erl_syntax.erl
@@ -3523,7 +3523,10 @@ qualified_name_segments(Node) ->
 %% @see is_form/1
 %% @see rule/2
 
--record(function, {name, clauses}).
+-record(function, {
+	name :: atom(),
+	clauses :: list()
+    }).
 %% XXX: This one is problematic because there is a tuple with the same
 %%      tag and size that comes from 'erl_parse'
 %% -record(function, {name :: syntaxTree(), clauses :: [syntaxTree()]}).
@@ -6100,7 +6103,7 @@ implicit_fun_name(Node) ->
 			     arity_qualifier(
 			       set_pos(atom(Atom), Pos),
 			       set_pos(integer(Arity), Pos)));
-	{'fun', Pos, {function, Module, Atom, Arity}} ->
+	{'fun', _Pos, {function, Module, Atom, Arity}} ->
 	    %% New in R15: fun M:F/A.
 	    module_qualifier(Module, arity_qualifier(Atom, Arity));
 	Node1 ->
diff --git a/lib/tools/c_src/erl_memory.c b/lib/tools/c_src/erl_memory.c
index 872d55e789..5239176d03 100644
--- a/lib/tools/c_src/erl_memory.c
+++ b/lib/tools/c_src/erl_memory.c
@@ -1224,7 +1224,7 @@ print_main_footer(em_state *state)
 
     switch (state->info.stop_reason) {
     case EMTP_STOP:
-	p += sprintf(p, stop_str);
+	p += sprintf(p, "%s", stop_str);
 	break;
     case EMTP_EXIT:
 	p += sprintf(p, exit_str, state->info.exit_status);
@@ -2339,7 +2339,7 @@ usage(char *sw, char *error)
     if (error)
 	exit(1);
     else {
-	char *help_str =
+	fprintf(filep, 
 	    "\n"
 	    "  []        - switch is allowed any number of times\n"
 	    "  {}        - switch is allowed at most one time\n"
@@ -2370,8 +2370,7 @@ usage(char *sw, char *error)
 	    "  " SW_CHAR "o        - display operation count values\n"
 	    "  " SW_CHAR "p <P>    - set listen port to <P>\n"
 	    "  " SW_CHAR "t        - display info about total values\n"
-	    "  " SW_CHAR "v        - verbose output\n";
-	fprintf(filep, help_str);
+	    "  " SW_CHAR "v        - verbose output\n");
 	exit(0);
     }
 
diff --git a/lib/xmerl/src/xmerl_uri.erl b/lib/xmerl/src/xmerl_uri.erl
index a0c6f1c2a7..1864651491 100644
--- a/lib/xmerl/src/xmerl_uri.erl
+++ b/lib/xmerl/src/xmerl_uri.erl
@@ -358,7 +358,7 @@ scan_host(C0) ->
 %% 							  Hex3=<?HEX;
 %% 							  Hex4=<?HEX ->
 %% 	    {C1,lists:reverse(lists:append(IPv6address))};
-	{C1,Hostname,[A|_HostF]} -> 
+	{C1,Hostname,[_A|_HostF]} -> 
 	    {C1,lists:reverse(lists:append(Hostname))}
 %%	_ ->
 %%	    {error,no_host}