Merge branch 'maint'

9 files changed, 17 insertions, 36 deletions

diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index da36c4437e..78ab6fa30f 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -5654,7 +5654,6 @@ build_stacktrace(Process* c_p, Eterm exc) {
     return res;
 }
 
-
 static BeamInstr*
 call_error_handler(Process* p, BeamInstr* fi, Eterm* reg, Eterm func)
 {
@@ -5702,7 +5701,6 @@ call_error_handler(Process* p, BeamInstr* fi, Eterm* reg, Eterm func)
     return ep->addressv[erts_active_code_ix()];
 }
 
-
 static Export*
 apply_setup_error_handler(Process* p, Eterm module, Eterm function, Uint arity, Eterm* reg)
 {
@@ -6208,7 +6206,6 @@ new_fun(Process* p, Eterm* reg, ErlFunEntry* fe, int num_free)
     return make_fun(funp);
 }
 
-
 
 int catchlevel(Process *p)
 {
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c
index 4193eb4f3f..938fd8f2c9 100644
--- a/erts/emulator/beam/beam_load.c
+++ b/erts/emulator/beam/beam_load.c
@@ -535,7 +535,6 @@ static int must_swap_floats;
 Uint erts_total_code_size;
 /**********************************************************************/
 
-
 void init_load(void)
 {
     FloatDef f;
@@ -1209,7 +1208,6 @@ verify_chunks(LoaderState* stp)
     return 0;
 }
 
-
 static int
 load_atom_table(LoaderState* stp)
 {
@@ -1255,7 +1253,6 @@ load_atom_table(LoaderState* stp)
     return 0;
 }
 
-
 static int
 load_import_table(LoaderState* stp)
 {
@@ -1308,7 +1305,6 @@ load_import_table(LoaderState* stp)
     return 0;
 }
 
-
 static int
 read_export_table(LoaderState* stp)
 {
@@ -1641,7 +1637,6 @@ read_line_table(LoaderState* stp)
     return 0;
 }
 
-
 static int
 read_code_header(LoaderState* stp)
 {
@@ -1711,7 +1706,6 @@ read_code_header(LoaderState* stp)
     return 0;
 }
 
-
 #define VerifyTag(Stp, Actual, Expected) \
     if (Actual != Expected) { \
        LoadError2(Stp, "bad tag %d; expected %d", Actual, Expected); \
@@ -1730,7 +1724,6 @@ read_code_header(LoaderState* stp)
     
 #define TermWords(t) (((t) / (sizeof(BeamInstr)/sizeof(Eterm))) + !!((t) % (sizeof(BeamInstr)/sizeof(Eterm))))
 
-
 static int
 load_code(LoaderState* stp)
 {
@@ -2512,7 +2505,6 @@ load_code(LoaderState* stp)
     return retval;
 }
 
-
 #define succ(St, X, Y) ((X).type == (Y).type && (X).val + 1 == (Y).val)
 #define succ2(St, X, Y) ((X).type == (Y).type && (X).val + 2 == (Y).val)
 #define succ3(St, X, Y) ((X).type == (Y).type && (X).val + 3 == (Y).val)
@@ -3958,7 +3950,6 @@ tuple_append_put(LoaderState* stp, GenOpArg Arity, GenOpArg Dst,
 }
 
 
-
 /*
  * Freeze the code in memory, move the string table into place,
  * resolve all labels.
@@ -4276,7 +4267,6 @@ freeze_code(LoaderState* stp)
     return 0;
 }
 
-
 static void
 final_touch(LoaderState* stp)
 {
@@ -4378,7 +4368,6 @@ final_touch(LoaderState* stp)
     }
 }
 
-
 static int
 transform_engine(LoaderState* st)
 {
@@ -4716,7 +4705,6 @@ transform_engine(LoaderState* st)
     return rval;
 }
 
-
 static void
 short_file(int line, LoaderState* stp, unsigned needed)
 {
@@ -4724,7 +4712,6 @@ short_file(int line, LoaderState* stp, unsigned needed)
 		stp->file_name, needed);
 }
 
-
 static void
 load_printf(int line, LoaderState* context, char *fmt,...)
 {
@@ -5190,7 +5177,6 @@ native_addresses(Process* p, Eterm mod)
     return result;
 }
 
-
 /*
  * Builds a list of all exported functions in the given module:
  *     [{Name, Arity},...]
@@ -5240,7 +5226,6 @@ exported_from_module(Process* p, /* Process whose heap to use. */
     return result;
 }
 
-
 /*
  * Returns a list of all attributes for the module.
  *
@@ -5281,7 +5266,6 @@ attributes_for_module(Process* p, /* Process whose heap to use. */
     return result;
 }
 
-
 /*
  * Returns a list containing compilation information.
  *
diff --git a/erts/emulator/drivers/unix/ttsl_drv.c b/erts/emulator/drivers/unix/ttsl_drv.c
index 1e436830e7..491e0a090e 100644
--- a/erts/emulator/drivers/unix/ttsl_drv.c
+++ b/erts/emulator/drivers/unix/ttsl_drv.c
@@ -745,7 +745,7 @@ static Sint16 get_sint16(char *s)
 {
     return ((*s << 8) | ((byte*)s)[1]);
 }
-
+
 static int start_lbuf(void)
 {
     if (!lbuf && !(lbuf = ( Uint32*) driver_alloc(lbuf_size * sizeof(Uint32))))
@@ -1091,7 +1091,7 @@ static int move_cursor(int from, int to)
       move_left(-dc);
     return TRUE;
 }
-
+
 static int start_termcap(void)
 {
     int eres;
@@ -1187,7 +1187,7 @@ static int move_down(int n)
       tputs(down, 1, outc);
     return TRUE;
 }
-		    
+
 
 /*
  * Updates cols if terminal has resized (SIGWINCH). Should be called
@@ -1209,7 +1209,7 @@ static void update_cols(void)
 	cols = width;
     }
 }
-		    
+
 
 /*
  * Put a terminal device into non-canonical mode with ECHO off.
diff --git a/erts/emulator/drivers/win32/win_efile.c b/erts/emulator/drivers/win32/win_efile.c
index b36a103f8e..319065f57b 100644
--- a/erts/emulator/drivers/win32/win_efile.c
+++ b/erts/emulator/drivers/win32/win_efile.c
@@ -1216,7 +1216,7 @@ int flags;
     return 1;
 }
 
-
+
 /*
  * is_root_unc_name - returns TRUE if the argument is a UNC name specifying
  *      a root share.  That is, if it is of the form \\server\share\.
diff --git a/erts/emulator/test/call_trace_SUITE.erl b/erts/emulator/test/call_trace_SUITE.erl
index eaecd32f95..ef1f2aa04c 100644
--- a/erts/emulator/test/call_trace_SUITE.erl
+++ b/erts/emulator/test/call_trace_SUITE.erl
@@ -1193,7 +1193,7 @@ bs_sum_b(Acc, <<>>) -> Acc.
     
 
 
-
+
 %%% Help functions.
 
 expect() ->
diff --git a/erts/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl
index 104bdf8aec..7087542899 100644
--- a/erts/emulator/test/driver_SUITE.erl
+++ b/erts/emulator/test/driver_SUITE.erl
@@ -367,7 +367,7 @@ compare(Got, Expected) ->
 	    ?t:fail(got_bad_data)
     end.
 
-
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% 		Driver timer test suites
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -515,7 +515,7 @@ try_change_timer(Port, Timeout) ->
 	    ?line test_server:fail("driver failed to timeout")
     end.
 
-
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% 		Queue test suites
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -719,7 +719,7 @@ deq(Port, Size) ->
 read_head(Port, Size) ->
     erlang:port_control(Port, ?READ_HEAD, <<Size:32>>).
 
-
+
 driver_unloaded(doc) ->
     [];
 driver_unloaded(suite) ->
diff --git a/erts/emulator/test/statistics_SUITE.erl b/erts/emulator/test/statistics_SUITE.erl
index a93dd309c1..c428be6c5a 100644
--- a/erts/emulator/test/statistics_SUITE.erl
+++ b/erts/emulator/test/statistics_SUITE.erl
@@ -75,7 +75,7 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-
+
 %%% Testing statistics(wall_clock).
 
 
@@ -121,7 +121,7 @@ wall_clock_update1(N) when N > 0 ->
 wall_clock_update1(0) ->
     ok.
 
-
+
 %%% Test statistics(runtime).
 
 
@@ -199,7 +199,7 @@ do_much(N) ->
     _ = 4784728478274827 * 72874284728472,
     do_much(N-1).
 
-
+
 reductions(doc) ->
     "Test that statistics(reductions) is callable, and that "
 	"Total_Reductions and Reductions_Since_Last_Call make sense. "
@@ -246,7 +246,7 @@ reductions_big_loop() ->
 	    reductions_big_loop()
     end.
 
-
+
 %%% Tests of statistics(run_queue).
 
 
@@ -295,7 +295,7 @@ hog_iter(N, Mon) when N > 0 ->
     end;
 hog_iter(0, Mon) ->
     ?line hog_iter(10000, Mon).
-
+
 %%% Tests of statistics(scheduler_wall_time).
 
 scheduler_wall_time(doc) ->
@@ -363,7 +363,7 @@ load_percentage([{Id, WN, TN}|Ss], [{Id, WP, TP}|Ps]) ->
     [100*(WN-WP) div (TN-TP)|load_percentage(Ss, Ps)];
 load_percentage([], []) -> [].
 
-
+
 garbage_collection(doc) ->
     "Tests that statistics(garbage_collection) is callable. "
     "It is not clear how to test anything more.";
diff --git a/erts/emulator/test/trace_SUITE.erl b/erts/emulator/test/trace_SUITE.erl
index 0f513f0dcb..2251575e5a 100644
--- a/erts/emulator/test/trace_SUITE.erl
+++ b/erts/emulator/test/trace_SUITE.erl
@@ -1427,7 +1427,7 @@ receive_nothing() ->
 	    ok
     end.
 
-
+
 %%% Models for various kinds of processes.
 
 process(Dest) ->
diff --git a/erts/emulator/test/trace_port_SUITE.erl b/erts/emulator/test/trace_port_SUITE.erl
index cc2eadafbc..99df8da107 100644
--- a/erts/emulator/test/trace_port_SUITE.erl
+++ b/erts/emulator/test/trace_port_SUITE.erl
@@ -648,7 +648,7 @@ fun_spawn(Fun, Opts) ->
 % 	    []
 %     end.
 
-
+
 %%% Models for various kinds of processes.
 
 %% Sends messages when ordered to.