First batch of attempts to deal with dialyzer issues...

10 files changed, 239 insertions, 189 deletions

diff --git a/lib/megaco/src/app/megaco.appup.src b/lib/megaco/src/app/megaco.appup.src
index 66068f650f..495a9ec9ae 100644
--- a/lib/megaco/src/app/megaco.appup.src
+++ b/lib/megaco/src/app/megaco.appup.src
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -133,50 +133,34 @@
 %%      |
 %%      v
 %%    3.15
+%%      |
+%%      v
+%%    3.15.1
 %%
 %%
 {"%VSN%",
  [
-  {"3.14.1.1", 
+  {"3.15", 
    [
-    {load_module, megaco_binary_transformer_prev3a, soft_purge, soft_purge, []},
-    {load_module, megaco_binary_transformer_prev3b, soft_purge, soft_purge, []},
-    {load_module, megaco_binary_transformer_prev3c, soft_purge, soft_purge, []},
+    {load_module, megaco_flex_scanner, soft_purge, soft_purge, []},
     {load_module, megaco_sdp, soft_purge, soft_purge, []},
-    {load_module, megaco_compact_text_encoder_v1, soft_purge, soft_purge, []},
-    {load_module, megaco_pretty_text_encoder_v1, soft_purge, soft_purge, []},
-    {load_module, megaco_compact_text_encoder_v2, soft_purge, soft_purge, []},
-    {load_module, megaco_pretty_text_encoder_v2, soft_purge, soft_purge, []},
-    {load_module, megaco_compact_text_encoder_prev3a, soft_purge, soft_purge, []},
-    {load_module, megaco_pretty_text_encoder_prev3a, soft_purge, soft_purge, []},
-    {load_module, megaco_compact_text_encoder_prev3b, soft_purge, soft_purge, []},
-    {load_module, megaco_pretty_text_encoder_prev3b, soft_purge, soft_purge, []},
-    {load_module, megaco_compact_text_encoder_prev3c, soft_purge, soft_purge, []},
-    {load_module, megaco_pretty_text_encoder_prev3c, soft_purge, soft_purge, []},
-    {load_module, megaco_compact_text_encoder_v3, soft_purge, soft_purge, []},
-    {load_module, megaco_pretty_text_encoder_v3, soft_purge, soft_purge, []}
+    {load_module, megaco_filter, soft_purge, soft_purge, []},
+    {load_module, megaco_timer, soft_purge, soft_purge, [megaco_config_misc]},
+    {update, megaco_config, soft, soft_purge, soft_purge, 
+     [megaco_timer, megaco_config_misc]},
+    {add_module,  megaco_config_misc}
    ]
   }
  ],
  [
-  {"3.14.1.1", 
+  {"3.15", 
    [
-    {load_module, megaco_binary_transformer_prev3a, soft_purge, soft_purge, []},
-    {load_module, megaco_binary_transformer_prev3b, soft_purge, soft_purge, []},
-    {load_module, megaco_binary_transformer_prev3c, soft_purge, soft_purge, []},
+    {load_module, megaco_flex_scanner, soft_purge, soft_purge, []},
     {load_module, megaco_sdp, soft_purge, soft_purge, []},
-    {load_module, megaco_compact_text_encoder_v1, soft_purge, soft_purge, []},
-    {load_module, megaco_pretty_text_encoder_v1, soft_purge, soft_purge, []},
-    {load_module, megaco_compact_text_encoder_v2, soft_purge, soft_purge, []},
-    {load_module, megaco_pretty_text_encoder_v2, soft_purge, soft_purge, []},
-    {load_module, megaco_compact_text_encoder_prev3a, soft_purge, soft_purge, []},
-    {load_module, megaco_pretty_text_encoder_prev3a, soft_purge, soft_purge, []},
-    {load_module, megaco_compact_text_encoder_prev3b, soft_purge, soft_purge, []},
-    {load_module, megaco_pretty_text_encoder_prev3b, soft_purge, soft_purge, []},
-    {load_module, megaco_compact_text_encoder_prev3c, soft_purge, soft_purge, []},
-    {load_module, megaco_pretty_text_encoder_prev3c, soft_purge, soft_purge, []},
-    {load_module, megaco_compact_text_encoder_v3, soft_purge, soft_purge, []},
-    {load_module, megaco_pretty_text_encoder_v3, soft_purge, soft_purge, []}
+    {load_module, megaco_filter, soft_purge, soft_purge, []},
+    {load_module, megaco_timer, soft_purge, soft_purge, [megaco_config]},
+    {update, megaco_config, soft, soft_purge, soft_purge, []},
+    {delete_module,  megaco_config_misc}
    ]
   }
  ]
diff --git a/lib/megaco/src/binary/megaco_binary_encoder_lib.erl b/lib/megaco/src/binary/megaco_binary_encoder_lib.erl
index 842d6b70d1..967ee93935 100644
--- a/lib/megaco/src/binary/megaco_binary_encoder_lib.erl
+++ b/lib/megaco/src/binary/megaco_binary_encoder_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2011. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -134,6 +134,12 @@ encode_transaction(EC, {Tag, _} = Trans, AsnMod, TransMod, Type)
 encode_transaction(_EC, T, _AsnMod, _TransMod, _Type) ->
     {error, {no_megaco_transaction, T}}.
 
+-spec do_encode_transaction(EC :: list(), 
+			    Trans :: tuple(), 
+			    AnsMod :: atom(),
+			    TransMod :: atom(),
+			    Type :: atom()) ->
+    {'ok', binary()} | {'error', any()}.
 do_encode_transaction([native], _Trans, _AsnMod, _TransMod, binary) ->
     %% asn1rt:encode(AsnMod, element(1, T), T);
     {error, not_implemented};
@@ -160,6 +166,12 @@ do_encode_transaction(EC, _Trans, _AsnMod, _TransMod, _Type) ->
 %% Convert a list of ActionRequest record's into a binary
 %% Return {ok, DeepIoList} | {error, Reason}
 %%----------------------------------------------------------------------
+-spec encode_action_requests(EC :: list(), 
+			     ARs :: list(), 
+			     AnsMod :: atom(),
+			     TransMod :: atom(),
+			     Type :: atom()) ->
+    {'ok', binary()} | {'error', any()}.
 encode_action_requests([native], _ARs, _AsnMod, _TransMod, binary) ->
     %% asn1rt:encode(AsnMod, element(1, T), T);
     {error, not_implemented};
@@ -183,13 +195,20 @@ encode_action_requests(EC, _ARs, _AsnMod, _TransMod, _Type) ->
 %% Convert a ActionRequest record into a binary
 %% Return {ok, DeepIoList} | {error, Reason}
 %%----------------------------------------------------------------------
-encode_action_request([native], _ARs, _AsnMod, _TransMod, binary) ->
+
+-spec encode_action_request(EC :: list(), 
+			    AR :: tuple(), 
+			    AnsMod :: atom(),
+			    TransMod :: atom(),
+			    Type :: atom()) ->
+    {'ok', binary()} | {'error', any()}.
+encode_action_request([native], _AR, _AsnMod, _TransMod, binary) ->
     %% asn1rt:encode(AsnMod, element(1, T), T);
     {error, not_implemented};
-encode_action_request(_EC, _ARs0, _AsnMod, _TransMod, binary) ->
+encode_action_request(_EC, _AR, _AsnMod, _TransMod, binary) ->
     {error, not_implemented};
-encode_action_request(EC, ARs, AsnMod, TransMod, io_list) ->
-    case encode_action_request(EC, ARs, AsnMod, TransMod, binary) of
+encode_action_request(EC, AR, AsnMod, TransMod, io_list) ->
+    case encode_action_request(EC, AR, AsnMod, TransMod, binary) of
 	{ok, Bin} when is_binary(Bin) ->
 	    {ok, Bin};
 	{ok, DeepIoList} ->
@@ -198,7 +217,7 @@ encode_action_request(EC, ARs, AsnMod, TransMod, io_list) ->
 	{error, Reason} ->
 	    {error, Reason} 
     end;
-encode_action_request(EC, _ARs, _AsnMod, _TransMod, _Type) ->
+encode_action_request(EC, _AR, _AsnMod, _TransMod, _Type) ->
     {error, {bad_encoding_config, EC}}.
 
 
diff --git a/lib/megaco/src/engine/depend.mk b/lib/megaco/src/engine/depend.mk
index 8d8c83e923..935eb813e5 100644
--- a/lib/megaco/src/engine/depend.mk
+++ b/lib/megaco/src/engine/depend.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2003-2009. All Rights Reserved.
+# Copyright Ericsson AB 2003-2011. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -17,6 +17,8 @@
 # 
 # %CopyrightEnd%
 
+$(EBIN)/megaco_config_misc.$(EMULATOR): megaco_config_misc.erl
+
 $(EBIN)/megaco_config.$(EMULATOR): megaco_config.erl \
 	../../include/megaco.hrl \
 	../app/megaco_internal.hrl
diff --git a/lib/megaco/src/engine/megaco_config.erl b/lib/megaco/src/engine/megaco_config.erl
index 6805db790d..b65ddbe232 100644
--- a/lib/megaco/src/engine/megaco_config.erl
+++ b/lib/megaco/src/engine/megaco_config.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -46,10 +46,10 @@
 
 	 %% Verification functions
          verify_val/2,
-	 verify_strict_uint/1,
-	 verify_strict_int/1, verify_strict_int/2, 
-	 verify_uint/1,
-	 verify_int/1, verify_int/2,
+%% 	 verify_strict_uint/1,
+%% 	 verify_strict_int/1, verify_strict_int/2, 
+%% 	 verify_uint/1,
+%% 	 verify_int/1, verify_int/2,
          
 
 	 %% Reply limit counter
@@ -1501,28 +1501,37 @@ verify_val(Item, Val) ->
         mid                    -> true;
         local_mid              -> true;
         remote_mid             -> true;
-        min_trans_id           -> verify_strict_uint(Val, 4294967295); % uint32
-        max_trans_id           -> verify_uint(Val, 4294967295);        % uint32
+        min_trans_id           -> 
+	    megaco_config_misc:verify_strict_uint(Val, 4294967295); % uint32
+        max_trans_id           -> 
+	    megaco_config_misc:verify_uint(Val, 4294967295);        % uint32
         request_timer          -> verify_timer(Val);
         long_request_timer     -> verify_timer(Val);
 
-        auto_ack               -> verify_bool(Val);
+        auto_ack               -> 
+	    megaco_config_misc:verify_bool(Val);
 
-	trans_ack              -> verify_bool(Val);
-        trans_ack_maxcount     -> verify_uint(Val);
+	trans_ack              -> 
+	    megaco_config_misc:verify_bool(Val);
+        trans_ack_maxcount     -> 
+	    megaco_config_misc:verify_uint(Val);
 
-	trans_req              -> verify_bool(Val);
-        trans_req_maxcount     -> verify_uint(Val);
-        trans_req_maxsize      -> verify_uint(Val);
+	trans_req              -> 
+	    megaco_config_misc:verify_bool(Val);
+        trans_req_maxcount     -> 
+	    megaco_config_misc:verify_uint(Val);
+        trans_req_maxsize      -> 
+	    megaco_config_misc:verify_uint(Val);
 
-        trans_timer            -> verify_timer(Val) and (Val >= 0);
-	trans_sender when Val == undefined -> true;
+        trans_timer            -> 
+	    verify_timer(Val) and (Val >= 0);
+	trans_sender when Val =:= undefined -> true;
 
         pending_timer                      -> verify_timer(Val);
-        sent_pending_limit                 -> verify_uint(Val) andalso 
-								 (Val > 0);
-        recv_pending_limit                 -> verify_uint(Val) andalso 
-								 (Val > 0);
+        sent_pending_limit                 -> 
+	    megaco_config_misc:verify_uint(Val) andalso (Val > 0);
+        recv_pending_limit                 -> 
+	    megaco_config_misc:verify_uint(Val) andalso (Val > 0);
         reply_timer                        -> verify_timer(Val);
         control_pid      when is_pid(Val)  -> true;
         monitor_ref                        -> true; % Internal usage only
@@ -1530,110 +1539,43 @@ verify_val(Item, Val) ->
         send_handle                        -> true;
         encoding_mod     when is_atom(Val) -> true;
         encoding_config  when is_list(Val) -> true;
-        protocol_version                   -> verify_strict_uint(Val);
+        protocol_version                   -> 
+	    megaco_config_misc:verify_strict_uint(Val);
         auth_data                          -> true;
         user_mod         when is_atom(Val) -> true;
         user_args        when is_list(Val) -> true;
         reply_data                         -> true;
-        threaded                           -> verify_bool(Val);
-        strict_version                     -> verify_bool(Val);
-	long_request_resend                -> verify_bool(Val);
-	call_proxy_gc_timeout              -> verify_strict_uint(Val);
-	cancel                             -> verify_bool(Val);
+        threaded                           -> 
+	    megaco_config_misc:verify_bool(Val);
+        strict_version                     -> 
+	    megaco_config_misc:verify_bool(Val);
+	long_request_resend                -> 
+	    megaco_config_misc:verify_bool(Val);
+	call_proxy_gc_timeout              -> 
+	    megaco_config_misc:verify_strict_uint(Val);
+	cancel                             -> 
+	    megaco_config_misc:verify_bool(Val);
 	resend_indication                  -> verify_resend_indication(Val);
 
-	segment_reply_ind               -> verify_bool(Val);
-	segment_recv_acc                -> verify_bool(Val);
+	segment_reply_ind               -> 
+	    megaco_config_misc:verify_bool(Val);
+	segment_recv_acc                -> 
+	    megaco_config_misc:verify_bool(Val);
 	segment_recv_timer              -> verify_timer(Val);
 	segment_send                    -> verify_segmentation_window(Val);
 	segment_send_timer              -> verify_timer(Val);
-	max_pdu_size                    -> verify_int(Val) andalso (Val > 0);
+	max_pdu_size                    -> 
+	    megaco_config_misc:verify_int(Val) andalso (Val > 0);
 	request_keep_alive_timeout      -> 
-	    (verify_uint(Val) orelse (Val =:= plain));
+	    (megaco_config_misc:verify_uint(Val) orelse (Val =:= plain));
 
         _                               -> false
     end.
 
 
 
-verify_bool(true)  -> true;
-verify_bool(false) -> true;
-verify_bool(_)     -> false.
-
 verify_resend_indication(flag) -> true;
-verify_resend_indication(Val)  -> verify_bool(Val).
-
--spec verify_strict_int(Int :: integer()) -> boolean().
-verify_strict_int(Int) when is_integer(Int) -> true;
-verify_strict_int(_)                        -> false.
-
--spec verify_strict_int(Int :: integer(), 
-			Max :: integer() | 'infinity') -> boolean().
-verify_strict_int(Int, infinity) ->
-    verify_strict_int(Int);
-verify_strict_int(Int, Max) ->
-    verify_strict_int(Int) andalso verify_strict_int(Max) andalso (Int =< Max).
-
--spec verify_strict_uint(Int :: non_neg_integer()) -> boolean().
-verify_strict_uint(Int) when is_integer(Int) andalso (Int >= 0) -> true;
-verify_strict_uint(_)                                           -> false.
-
--spec verify_strict_uint(Int :: non_neg_integer(), 
-			 Max :: non_neg_integer() | 'infinity') -> boolean().
-verify_strict_uint(Int, infinity) ->
-    verify_strict_uint(Int);
-verify_strict_uint(Int, Max) ->
-    verify_strict_int(Int, 0, Max).
-
--spec verify_uint(Val :: non_neg_integer() | 'infinity') -> boolean().
-verify_uint(infinity) -> true;
-verify_uint(Val)      -> verify_strict_uint(Val).
-
--spec verify_int(Val :: integer() | 'infinity') -> boolean().
-verify_int(infinity) -> true;
-verify_int(Val)      -> verify_strict_int(Val).
-
--spec verify_int(Int :: integer() | 'infinity', 
-		 Max :: integer() | 'infinity') -> boolean().
-verify_int(Int, infinity) ->
-    verify_int(Int);
-verify_int(infinity, _Max) ->
-    true;
-verify_int(Int, Max) ->
-    verify_strict_int(Int) andalso verify_strict_int(Max) andalso (Int =< Max).
-
--spec verify_uint(Int :: non_neg_integer() | 'infinity', 
-		  Max :: non_neg_integer() | 'infinity') -> boolean().
-verify_uint(Int, infinity) ->
-    verify_uint(Int);
-verify_uint(infinity, _Max) ->
-    true;
-verify_uint(Int, Max) ->
-    verify_strict_int(Int, 0, Max).
-
--spec verify_strict_int(Int :: integer(), 
-			Min :: integer(), 
-			Max :: integer()) -> boolean().
-verify_strict_int(Val, Min, Max) 
-  when (is_integer(Val) andalso 
-	is_integer(Min) andalso 
-	is_integer(Max) andalso 
-	(Val >= Min)    andalso 
-	(Val =< Max)) ->
-    true;
-verify_strict_int(_Val, _Min, _Max) ->
-    false.
-    
--spec verify_int(Val :: integer() | 'infinity', 
-		 Min :: integer(), 
-		 Max :: integer() | 'infinity') -> boolean(). 
-verify_int(infinity, Min, infinity) ->
-    verify_strict_int(Min);
-verify_int(Val, Min, infinity) ->
-    verify_strict_int(Val) andalso 
-	verify_strict_int(Min) andalso (Val >= Min);
-verify_int(Int, Min, Max) ->
-    verify_strict_int(Int, Min, Max).
+verify_resend_indication(Val)  -> megaco_config_misc:verify_bool(Val).
 
 verify_timer(Timer) ->
     megaco_timer:verify(Timer).
@@ -1641,7 +1583,7 @@ verify_timer(Timer) ->
 verify_segmentation_window(none) ->
     true;
 verify_segmentation_window(K) ->
-    verify_int(K, 1, infinity).
+    megaco_config_misc:verify_int(K, 1, infinity).
 
 handle_stop_user(UserMid) ->
     case catch user_info(UserMid, mid) of
diff --git a/lib/megaco/src/engine/megaco_config_misc.erl b/lib/megaco/src/engine/megaco_config_misc.erl
new file mode 100644
index 0000000000..0a1601c766
--- /dev/null
+++ b/lib/megaco/src/engine/megaco_config_misc.erl
@@ -0,0 +1,113 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011-2011. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+%%----------------------------------------------------------------------
+%% Purpose: Utility module for megaco_config 
+%%----------------------------------------------------------------------
+%% 
+
+-module(megaco_config_misc).
+
+%% Application internal exports
+-export([
+         verify_bool/1, 
+
+	 verify_int/1, verify_int/2, verify_int/3, 
+	 verify_strict_int/1, verify_strict_int/2, verify_strict_int/3, 
+
+	 verify_uint/1, verify_uint/2, 
+	 verify_strict_uint/1, verify_strict_uint/2
+        ]).
+
+
+%%%----------------------------------------------------------------------
+%%% API
+%%%----------------------------------------------------------------------
+
+verify_bool(true)  -> true;
+verify_bool(false) -> true;
+verify_bool(_)     -> false.
+
+
+%% verify_int(Val) -> boolean()
+verify_int(infinity) -> true;
+verify_int(Val)      -> verify_strict_int(Val).
+
+%% verify_int(Val, Max) -> boolean()
+verify_int(Int, infinity) ->
+    verify_int(Int);
+verify_int(infinity, _Max) ->
+    true;
+verify_int(Int, Max) ->
+    verify_strict_int(Int) andalso verify_strict_int(Max) andalso (Int =< Max).
+
+%% verify_int(Val, Min, Max) -> boolean()
+verify_int(infinity, Min, infinity) ->
+    verify_strict_int(Min);
+verify_int(Val, Min, infinity) ->
+    verify_strict_int(Val) andalso 
+	verify_strict_int(Min) andalso (Val >= Min);
+verify_int(Int, Min, Max) ->
+    verify_strict_int(Int, Min, Max).
+
+%% verify_strict_int(Val) -> boolean()
+verify_strict_int(Int) when is_integer(Int) -> true;
+verify_strict_int(_)                        -> false.
+
+%% verify_strict_int(Val, Max) -> boolean()
+verify_strict_int(Int, infinity) ->
+    verify_strict_int(Int);
+verify_strict_int(Int, Max) ->
+    verify_strict_int(Int) andalso verify_strict_int(Max) andalso (Int =< Max).
+
+%% verify_strict_int(Val, Min, Max) -> boolean()
+verify_strict_int(Val, Min, Max) 
+  when (is_integer(Val) andalso 
+	is_integer(Min) andalso 
+	is_integer(Max) andalso 
+	(Val >= Min)    andalso 
+	(Val =< Max)) ->
+    true;
+verify_strict_int(_Val, _Min, _Max) ->
+    false.
+    
+
+%% verify_uint(Val) -> boolean()
+verify_uint(infinity) -> true;
+verify_uint(Val)      -> verify_strict_uint(Val).
+
+%% verify_uint(Val, Max) -> boolean()
+verify_uint(Int, infinity) ->
+    verify_uint(Int);
+verify_uint(infinity, _Max) ->
+    true;
+verify_uint(Int, Max) ->
+    verify_strict_int(Int, 0, Max).
+
+%% verify_strict_uint(Val) -> boolean()
+verify_strict_uint(Int) when is_integer(Int) andalso (Int >= 0) -> true;
+verify_strict_uint(_)                                           -> false.
+
+%% verify_strict_uint(Val, Max) -> boolean()
+verify_strict_uint(Int, infinity) ->
+    verify_strict_uint(Int);
+verify_strict_uint(Int, Max) ->
+    verify_strict_int(Int, 0, Max).
+
diff --git a/lib/megaco/src/engine/megaco_filter.erl b/lib/megaco/src/engine/megaco_filter.erl
index 9df752789c..fb0c700a82 100644
--- a/lib/megaco/src/engine/megaco_filter.erl
+++ b/lib/megaco/src/engine/megaco_filter.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -21,6 +21,7 @@
 %%----------------------------------------------------------------------
 %% Purpose : Megaco/H.248 customization of the Event Tracer tool
 %%----------------------------------------------------------------------
+%%
 
 -module(megaco_filter).
 
@@ -33,6 +34,7 @@
 -include_lib("megaco/src/app/megaco_internal.hrl").
 -include_lib("et/include/et.hrl").
 
+
 %%----------------------------------------------------------------------
 %% BUGBUG: There are some opportunities for improvements:
 %%
@@ -43,7 +45,8 @@
 %%   records that already are defined in megaco_message_{v1,v2,v3}.hrl.
 %% * The records megaco_udp and megaco_tcp are copied from the files
 %%   megaco_udp.hrl and megaco_tcp.hrl respectively, as we cannot include
-%%   both header files. They both defines the macros HEAP_SIZE and GC_MSG_LIMIT.
+%%   both header files. 
+%%   They both defines the macros HEAP_SIZE and GC_MSG_LIMIT.
 
 %%-include("megaco_message_internal.hrl").
 -record('megaco_transaction_reply',
@@ -76,6 +79,8 @@
 	 module    = megaco,
 	 serialize = false  % false: Spawn a new process for each message
 	}).
+
+
 %%----------------------------------------------------------------------
 
 start() ->
@@ -360,28 +365,24 @@ pretty(_ConnData, MegaMsg) when is_record(MegaMsg, 'MegacoMessage') ->
     {ok, Bin} = megaco_pretty_text_encoder:encode_message([], MegaMsg),
     term_to_string(Bin);
 pretty(_ConnData, CmdReq) when is_record(CmdReq, 'CommandRequest') ->
-    {ok, IoList} = megaco_pretty_text_encoder:encode_command_request(CmdReq),
-    term_to_string(lists:flatten(IoList));
+    {ok, Bin} = megaco_pretty_text_encoder:encode_command_request(CmdReq),
+    term_to_string(Bin);
 pretty(_ConnData, {complete_success, ContextId, RepList}) ->
     ActRep = #'ActionReply'{contextId    = ContextId, 
 			    commandReply = RepList},
-    {ok, IoList} = megaco_pretty_text_encoder:encode_action_reply(ActRep),
-    term_to_string(lists:flatten(IoList));
+    {ok, Bin} = megaco_pretty_text_encoder:encode_action_reply(ActRep),
+    term_to_string(Bin);
 pretty(_ConnData, AR) when is_record(AR, 'ActionReply') ->
-    {ok, IoList} = megaco_pretty_text_encoder:encode_action_reply(AR),
-    term_to_string(lists:flatten(IoList));
+    {ok, Bin} = megaco_pretty_text_encoder:encode_action_reply(AR),
+    term_to_string(Bin);
 pretty(_ConnData, {partial_failure, ContextId, RepList}) ->
     ActRep = #'ActionReply'{contextId    = ContextId, 
 			    commandReply = RepList},
-    {ok, IoList} = megaco_pretty_text_encoder:encode_action_reply(ActRep),
-    term_to_string(lists:flatten(IoList));
+    {ok, Bin} = megaco_pretty_text_encoder:encode_action_reply(ActRep),
+    term_to_string(Bin);
 pretty(_ConnData, {trans, Trans}) ->
-    case megaco_pretty_text_encoder:encode_transaction(Trans) of
-	{ok, Bin} when is_binary(Bin) ->
-	    term_to_string(binary_to_list(Bin));
-	{ok, IoList} ->
-	    term_to_string(lists:flatten(IoList))
-    end;
+    {ok, Bin} = megaco_pretty_text_encoder:encode_transaction(Trans),
+    term_to_string(Bin);
 pretty(__ConnData, Other) ->
     term_to_string(Other).
 
diff --git a/lib/megaco/src/engine/megaco_sdp.erl b/lib/megaco/src/engine/megaco_sdp.erl
index 37f28cac59..96732584fb 100644
--- a/lib/megaco/src/engine/megaco_sdp.erl
+++ b/lib/megaco/src/engine/megaco_sdp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -877,9 +877,7 @@ decode_bandwidth_bwt("CT") ->
 decode_bandwidth_bwt("AS") ->
     as;
 decode_bandwidth_bwt(BwType) when is_list(BwType) ->
-    BwType;
-decode_bandwidth_bwt(BadBwType) ->
-    error({invalid_bandwidth_bwtype, BadBwType}).
+    BwType.
 
 encode_bandwidth_bwt(ct) ->
     "CT";
diff --git a/lib/megaco/src/engine/megaco_timer.erl b/lib/megaco/src/engine/megaco_timer.erl
index 9f524523a8..1336be0b5b 100644
--- a/lib/megaco/src/engine/megaco_timer.erl
+++ b/lib/megaco/src/engine/megaco_timer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -42,7 +42,7 @@
 %% NewTimer    = megaco_timer() 
 %% TimeoutTime = infinity | integer()
 %% 
-init(SingleWaitFor) when SingleWaitFor == infinity ->
+init(SingleWaitFor) when SingleWaitFor =:= infinity ->
     {SingleWaitFor, timeout};
 init(SingleWaitFor) when is_integer(SingleWaitFor) and (SingleWaitFor >= 0) ->
     {SingleWaitFor, timeout};
@@ -76,17 +76,17 @@ verify(#megaco_incr_timer{wait_for    = WaitFor,
 			  factor      = Factor,
 			  incr        = Incr,
 			  max_retries = MaxRetries}) ->
-    (megaco_config:verify_strict_uint(WaitFor) and
-     megaco_config:verify_strict_uint(Factor)  and
-     megaco_config:verify_strict_int(Incr)     and
+    (megaco_config_misc:verify_strict_uint(WaitFor) and
+     megaco_config_misc:verify_strict_uint(Factor)  and
+     megaco_config_misc:verify_strict_int(Incr)     and
      verify_max_retries(MaxRetries));
 verify(Timer) ->
-    megaco_config:verify_uint(Timer).
+    megaco_config_misc:verify_uint(Timer).
 
 verify_max_retries(infinity_restartable) ->
     true;
 verify_max_retries(Val) ->
-    megaco_config:verify_uint(Val).
+    megaco_config_misc:verify_uint(Val).
 
 
 %%-----------------------------------------------------------------
diff --git a/lib/megaco/src/engine/modules.mk b/lib/megaco/src/engine/modules.mk
index 44bcadc37b..4bc57cd63e 100644
--- a/lib/megaco/src/engine/modules.mk
+++ b/lib/megaco/src/engine/modules.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2001-2009. All Rights Reserved.
+# Copyright Ericsson AB 2001-2011. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -24,6 +24,7 @@ BEHAVIOUR_MODULES = \
 
 MODULES = \
 	$(BEHAVIOUR_MODULES) \
+	megaco_config_misc \
 	megaco_config \
 	megaco_digit_map \
 	megaco_erl_dist_encoder \
diff --git a/lib/megaco/src/flex/megaco_flex_scanner.erl b/lib/megaco/src/flex/megaco_flex_scanner.erl
index e471412c13..508f8905e7 100644
--- a/lib/megaco/src/flex/megaco_flex_scanner.erl
+++ b/lib/megaco/src/flex/megaco_flex_scanner.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -30,21 +30,11 @@
 -define(SCHED_ID(),            erlang:system_info(scheduler_id)).
 -define(SMP_SUPPORT_DEFAULT(), erlang:system_info(smp_support)).
 
-is_enabled() ->
-    case ?ENABLE_MEGACO_FLEX_SCANNER of
-	true ->
-	    true;
-	_ ->
-	    false
-    end.
+is_enabled() -> 
+    (true =:= ?ENABLE_MEGACO_FLEX_SCANNER).
     
 is_reentrant_enabled() ->
-    case ?MEGACO_REENTRANT_FLEX_SCANNER of
-	true ->
-	    true;
-	_ ->
-	    false
-    end.
+    (true =:= ?MEGACO_REENTRANT_FLEX_SCANNER).
 
 is_scanner_port(Port, Port) when is_port(Port) ->
     true;