Merge branch 'egil/fix-compiler-warnings' into maint

* egil/fix-compiler-warnings:
  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

1 files changed, 3 insertions, 4 deletions

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);
     }