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, 2 insertions, 3 deletions

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