From 1b8f86d8314389bf6033d23d3e6d707514ba7612 Mon Sep 17 00:00:00 2001
From: Patrik Nyblom <pan@erlang.org>
Date: Wed, 2 Jun 2010 15:22:19 +0200
Subject: Remove (harmless) warnings about min/max in core applications

---
 lib/tv/src/tv_io_lib_format.erl |  7 ++----
 lib/tv/src/tv_pb.erl            | 27 +----------------------
 lib/tv/src/tv_pg_gridfcns.erl   | 49 +++--------------------------------------
 3 files changed, 6 insertions(+), 77 deletions(-)

(limited to 'lib/tv')

diff --git a/lib/tv/src/tv_io_lib_format.erl b/lib/tv/src/tv_io_lib_format.erl
index 5042fd3f9d..b7d4b8505f 100644
--- a/lib/tv/src/tv_io_lib_format.erl
+++ b/lib/tv/src/tv_io_lib_format.erl
@@ -188,7 +188,7 @@ indentation([], I) -> I.
 
 term(T, none, _Adj, none, _Pad) -> T;
 term(T, none, Adj, P, Pad) -> term(T, P, Adj, P, Pad);
-term(T, F, Adj, none, Pad) -> term(T, F, Adj, min(flat_length(T), F), Pad);
+term(T, F, Adj, none, Pad) -> term(T, F, Adj, erlang:min(flat_length(T), F), Pad);
 term(T, F, Adj, P, Pad) when F >= P ->
     adjust_error(T, F, Adj, P, Pad).
 
@@ -316,7 +316,7 @@ fwrite_g(Fl, F, Adj, P, Pad) ->
 
 string(S, none, _Adj, none, _Pad) -> S;
 string(S, F, Adj, none, Pad) ->
-    string(S, F, Adj, min(flat_length(S), F), Pad);
+    string(S, F, Adj, erlang:min(flat_length(S), F), Pad);
 string(S, none, _Adj, P, Pad) ->
     string:left(flatten(S), P, Pad);
 string(S, F, Adj, P, Pad) when F >= P ->
@@ -362,9 +362,6 @@ reverse([H|T], Stack) ->
     reverse(T, [H|Stack]);
 reverse([], Stack) -> Stack.
 
-min(L, R) when L < R -> L;
-min(_, R) -> R.
-
 %% flatten(List)
 %%  Flatten a list.
 
diff --git a/lib/tv/src/tv_pb.erl b/lib/tv/src/tv_pb.erl
index 34db8d0772..4c30cb8320 100644
--- a/lib/tv/src/tv_pb.erl
+++ b/lib/tv/src/tv_pb.erl
@@ -522,7 +522,7 @@ handle_col_resizing(RbtnId, RealCol, VirtualCol, Xpos, ProcVars) ->
 get_xdiff(Id, Btn, LastXdiff, LineId, LineXpos, MinAllowedXdiff) ->
     receive
 	{gs, Id, motion, {resbtn, _RealCol, _VirtCol, _OldXpos}, [NewXdiff | _T]} ->
-	    UsedXdiff = max(MinAllowedXdiff, NewXdiff),
+	    UsedXdiff = erlang:max(MinAllowedXdiff, NewXdiff),
 	    gs:config(LineId, [{x, LineXpos + UsedXdiff}]),
 	    get_xdiff(Id, Btn, UsedXdiff, LineId, LineXpos, MinAllowedXdiff);
 	{gs, Id, buttonrelease, _Data, [Btn | _T]} ->
@@ -658,28 +658,3 @@ update_vbtns(Msg, ProcVars) ->
 update_keys(Msg, ProcVars) ->
     #pb_key_info{list_of_keys = KeyList} = Msg,
     tv_pb_funcs:update_keys(KeyList, ProcVars).
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-max(A, B) when A >= B ->
-    A;
-max(_, B) ->
-    B.
-    
-
diff --git a/lib/tv/src/tv_pg_gridfcns.erl b/lib/tv/src/tv_pg_gridfcns.erl
index 809403fd96..10445ccabe 100644
--- a/lib/tv/src/tv_pg_gridfcns.erl
+++ b/lib/tv/src/tv_pg_gridfcns.erl
@@ -98,7 +98,7 @@ init_grid(GridParentId, GridWidth,
 			     nof_rows_shown      = NofRowsShown
 			    },
 
-    NewNofCols = max(length(ColsShown), NofCols),
+    NewNofCols = erlang:max(length(ColsShown), NofCols),
 
        % The GridColWidths list shall contain the current width of each frame.
     NewColWidths = update_col_widths(ColsShown, ColWidths, FirstColShown, 
@@ -270,7 +270,7 @@ resize_grid_column(RealCol, VirtualCol, Xdiff, ProcVars) ->
 		 lists_as_strings = ListAsStr}  = GridP,
     
        % Get new width!
-    Width = min(MaxColWidth, max((lists:nth(VirtualCol, ColWidths) + Xdiff),
+    Width = erlang:min(MaxColWidth, erlang:max((lists:nth(VirtualCol, ColWidths) + Xdiff),
 				 MinColWidth)),
 
        % Resize the column.
@@ -1336,7 +1336,7 @@ resize_all_grid_columns(RealCol, [ColWidth | Tail], ColFrameIds, MaxColWidth, Mi
 
 
 resize_one_column(RealCol, Width, ColFrameIds, MaxW, MinW) ->
-    NewWidthOfCol = min(MaxW, max(Width, MinW)),
+    NewWidthOfCol = erlang:min(MaxW, erlang:max(Width, MinW)),
     case length(ColFrameIds) of
 	RealCol ->
 	    done;
@@ -1894,46 +1894,3 @@ extract_ids_for_one_row(N, [ColIds | Tail]) ->
 %%%---------------------------------------------------------------------
 %%% END of functions used to create the grid.
 %%%---------------------------------------------------------------------
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-max(A, B) when A > B ->
-    A;
-max(_, B) ->
-    B.
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-min(A, B) when A < B ->
-    A;
-min(_, B) ->
-    B.
-    
-- 
cgit v1.2.1