[snmp] Cleanup and changed atl conversion block default

Changed the default value for the Audit Trail Log
conversion to true. Also some cleanup.

OTP-11396

4 files changed, 41 insertions, 38 deletions

diff --git a/lib/snmp/src/agent/snmpa.erl b/lib/snmp/src/agent/snmpa.erl
index 3804966e61..aea63effe6 100644
--- a/lib/snmp/src/agent/snmpa.erl
+++ b/lib/snmp/src/agent/snmpa.erl
@@ -129,7 +129,8 @@
 -include("snmpa_internal.hrl").
 -include_lib("snmp/include/snmp_types.hrl"). % type of me needed. 
 
--define(DISCO_EXTRA_INFO, undefined).
+-define(DISCO_EXTRA_INFO,  undefined).
+-define(ATL_BLOCK_DEFAULT, true).
 
 
 %%-----------------------------------------------------------------
@@ -893,7 +894,7 @@ log_to_txt(LogDir, Block)
     snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block);
 
 log_to_txt(LogDir, Mibs) -> 
-    Block   = false, 
+    Block   = ?ATL_BLOCK_DEFAULT, 
     OutFile = "snmpa_log.txt",       
     LogName = ?audit_trail_log_name, 
     LogFile = ?audit_trail_log_file, 
@@ -915,7 +916,7 @@ log_to_txt(LogDir, Mibs, Block)
     LogFile = ?audit_trail_log_file, 
     snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block);
 log_to_txt(LogDir, Mibs, OutFile) -> 
-    Block   = false, 
+    Block   = ?ATL_BLOCK_DEFAULT, 
     LogName = ?audit_trail_log_name, 
     LogFile = ?audit_trail_log_file, 
     snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block).
@@ -937,7 +938,7 @@ log_to_txt(LogDir, Mibs, OutFile, Block)
     LogFile = ?audit_trail_log_file, 
     snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block);
 log_to_txt(LogDir, Mibs, OutFile, LogName) -> 
-    Block   = false, 
+    Block   = ?ATL_BLOCK_DEFAULT, 
     LogFile = ?audit_trail_log_file, 
     snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block).
 
@@ -959,7 +960,7 @@ log_to_txt(LogDir, Mibs, OutFile, LogName, Block)
     LogFile = ?audit_trail_log_file, 
     snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block);
 log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile) -> 
-    Block = false, 
+    Block = ?ATL_BLOCK_DEFAULT, 
     snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block).
 
 -spec log_to_txt(LogDir  :: snmp:dir(), 
@@ -981,7 +982,7 @@ log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block)
   when ((Block =:= true) orelse (Block =:= false)) -> 
     snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block);
 log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start) -> 
-    Block = false, 
+    Block = ?ATL_BLOCK_DEFAULT, 
     snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start).
 
 -spec log_to_txt(LogDir  :: snmp:dir(), 
@@ -1006,7 +1007,7 @@ log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start)
     snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start);
 
 log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop) -> 
-    Block = false, 
+    Block = ?ATL_BLOCK_DEFAULT, 
     snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop).
 
 -spec log_to_txt(LogDir  :: snmp:dir(), 
@@ -1033,7 +1034,7 @@ log_to_io(LogDir, Block)
     LogFile = ?audit_trail_log_file, 
     snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block);
 log_to_io(LogDir, Mibs) -> 
-    Block   = false, 
+    Block   = ?ATL_BLOCK_DEFAULT, 
     LogName = ?audit_trail_log_name, 
     LogFile = ?audit_trail_log_file, 
     snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block).
@@ -1044,7 +1045,7 @@ log_to_io(LogDir, Mibs, Block)
     LogFile = ?audit_trail_log_file, 
     snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block);
 log_to_io(LogDir, Mibs, LogName) -> 
-    Block   = false, 
+    Block   = ?ATL_BLOCK_DEFAULT, 
     LogFile = ?audit_trail_log_file, 
     snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block).
 
@@ -1053,21 +1054,21 @@ log_to_io(LogDir, Mibs, LogName, Block)
     LogFile = ?audit_trail_log_file, 
     snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block);
 log_to_io(LogDir, Mibs, LogName, LogFile) -> 
-    Block = false, 
+    Block = ?ATL_BLOCK_DEFAULT, 
     snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block).
 
 log_to_io(LogDir, Mibs, LogName, LogFile, Block) 
   when ((Block =:= true) orelse (Block =:= false)) -> 
     snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block);
 log_to_io(LogDir, Mibs, LogName, LogFile, Start) -> 
-    Block = false, 
+    Block = ?ATL_BLOCK_DEFAULT, 
     snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start).
 
 log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start) 
   when ((Block =:= true) orelse (Block =:= false)) -> 
     snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start);
 log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop) -> 
-    Block = false, 
+    Block = ?ATL_BLOCK_DEFAULT, 
     snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop).
 
 log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop) -> 
diff --git a/lib/snmp/src/app/snmp.erl b/lib/snmp/src/app/snmp.erl
index 967afa0e08..16ccee9612 100644
--- a/lib/snmp/src/app/snmp.erl
+++ b/lib/snmp/src/app/snmp.erl
@@ -150,8 +150,8 @@
 	     {get_agent_caps,        0, eventually}]).
  
 
--define(APPLICATION, snmp).
-
+-define(APPLICATION,       snmp).
+-define(ATL_BLOCK_DEFAULT, true).
 
 
 %%-----------------------------------------------------------------
@@ -859,7 +859,7 @@ read_mib(FileName) ->
 %%%-----------------------------------------------------------------
 
 log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile) -> 
-    Block = false, 
+    Block = ?ATL_BLOCK_DEFAULT, 
     Start = null, 
     Stop  = null, 
     log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop).
@@ -870,7 +870,7 @@ log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block)
     Stop  = null, 
     log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop);
 log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start) -> 
-    Block = false, 
+    Block = ?ATL_BLOCK_DEFAULT, 
     Stop  = null, 
     log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop).
 
@@ -879,7 +879,7 @@ log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start)
     Stop  = null, 
     log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop);
 log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop) -> 
-    Block = false, 
+    Block = ?ATL_BLOCK_DEFAULT, 
     log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop).
 
 log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop) -> 
@@ -888,7 +888,7 @@ log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop) ->
 
 
 log_to_io(LogDir, Mibs, LogName, LogFile) -> 
-    Block = false, 
+    Block = ?ATL_BLOCK_DEFAULT, 
     Start = null, 
     Stop  = null, 
     log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop).
@@ -899,7 +899,7 @@ log_to_io(LogDir, Mibs, LogName, LogFile, Block)
     Stop  = null, 
     log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop);
 log_to_io(LogDir, Mibs, LogName, LogFile, Start) -> 
-    Block = false, 
+    Block = ?ATL_BLOCK_DEFAULT, 
     Stop  = null, 
     log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop).
 
@@ -908,7 +908,7 @@ log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start)
     Stop  = null, 
     log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop);
 log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop) -> 
-    Block = false, 
+    Block = ?ATL_BLOCK_DEFAULT, 
     log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop).
 
 log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop) -> 
diff --git a/lib/snmp/src/manager/snmpm.erl b/lib/snmp/src/manager/snmpm.erl
index a749153ece..379abe933e 100644
--- a/lib/snmp/src/manager/snmpm.erl
+++ b/lib/snmp/src/manager/snmpm.erl
@@ -118,6 +118,7 @@
 -include("snmp_verbosity.hrl").
 
 -define(DEFAULT_AGENT_PORT, 161).
+-define(ATL_BLOCK_DEFAULT,  true).
 
 
 %% This function is called when the snmp application
@@ -782,7 +783,7 @@ log_to_txt(LogDir, Block)
     LogFile = ?audit_trail_log_file, 
     snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block);
 log_to_txt(LogDir, Mibs) ->
-    Block   = false, 
+    Block   = ?ATL_BLOCK_DEFAULT, 
     OutFile = "snmpm_log.txt",       
     LogName = ?audit_trail_log_name, 
     LogFile = ?audit_trail_log_file, 
@@ -804,7 +805,7 @@ log_to_txt(LogDir, Mibs, Block)
     LogFile = ?audit_trail_log_file, 
     snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block);
 log_to_txt(LogDir, Mibs, OutFile) ->
-    Block   = false, 
+    Block   = ?ATL_BLOCK_DEFAULT, 
     LogName = ?audit_trail_log_name, 
     LogFile = ?audit_trail_log_file, 
     snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block).
@@ -826,7 +827,7 @@ log_to_txt(LogDir, Mibs, OutFile, Block)
     LogFile = ?audit_trail_log_file, 
     snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block); 
 log_to_txt(LogDir, Mibs, OutFile, LogName) ->
-    Block   = false, 
+    Block   = ?ATL_BLOCK_DEFAULT, 
     LogFile = ?audit_trail_log_file, 
     snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block).
 
@@ -848,7 +849,7 @@ log_to_txt(LogDir, Mibs, OutFile, LogName, Block)
     LogFile = ?audit_trail_log_file, 
     snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block);
 log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile) -> 
-    Block = false, 
+    Block = ?ATL_BLOCK_DEFAULT, 
     snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block).
 
 -spec log_to_txt(LogDir  :: snmp:dir(), 
@@ -870,7 +871,7 @@ log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block)
   when ((Block =:= true) orelse (Block =:= false)) -> 
     snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block);
 log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start) -> 
-    Block = false, 
+    Block = ?ATL_BLOCK_DEFAULT, 
     snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start).
 
 -spec log_to_txt(LogDir  :: snmp:dir(), 
@@ -894,7 +895,7 @@ log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start)
   when ((Block =:= true) orelse (Block =:= false)) -> 
     snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start);
 log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop) -> 
-    Block = false, 
+    Block = ?ATL_BLOCK_DEFAULT, 
     snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop).
 
 -spec log_to_txt(LogDir  :: snmp:dir(), 
@@ -931,7 +932,7 @@ log_to_io(LogDir, Mibs, Block)
     LogFile = ?audit_trail_log_file, 
     snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block);
 log_to_io(LogDir, Mibs, LogName) ->
-    Block   = false, 
+    Block   = ?ATL_BLOCK_DEFAULT, 
     LogFile = ?audit_trail_log_file, 
     snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block).
 
@@ -940,21 +941,21 @@ log_to_io(LogDir, Mibs, LogName, Block)
     LogFile = ?audit_trail_log_file, 
     snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block);
 log_to_io(LogDir, Mibs, LogName, LogFile) -> 
-    Block = false, 
+    Block = ?ATL_BLOCK_DEFAULT, 
     snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block).
 
 log_to_io(LogDir, Mibs, LogName, LogFile, Block) 
   when ((Block =:= true) orelse (Block =:= false)) -> 
     snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block);
 log_to_io(LogDir, Mibs, LogName, LogFile, Start) -> 
-    Block = false, 
+    Block = ?ATL_BLOCK_DEFAULT, 
     snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start).
 
 log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start) 
   when ((Block =:= true) orelse (Block =:= false)) -> 
     snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start); 
 log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop) -> 
-    Block = false, 
+    Block = ?ATL_BLOCK_DEFAULT, 
     snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop).
 
 log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop) -> 
diff --git a/lib/snmp/src/misc/snmp_log.erl b/lib/snmp/src/misc/snmp_log.erl
index de03c97281..ce3af66f88 100644
--- a/lib/snmp/src/misc/snmp_log.erl
+++ b/lib/snmp/src/misc/snmp_log.erl
@@ -52,8 +52,9 @@
 -define(VMODULE,"LOG").
 -include("snmp_verbosity.hrl").
 
--define(LOG_FORMAT, internal).
--define(LOG_TYPE,   wrap).
+-define(LOG_FORMAT,    internal).
+-define(LOG_TYPE,      wrap).
+-define(BLOCK_DEFAULT, true). 
 
 -record(snmp_log, {id, seqno}).
 
@@ -400,7 +401,7 @@ do_change_size(Log, NewSize) ->
 
 %% <BACKWARD-COMPAT>
 log_to_txt(Log, FileName, Dir, Mibs, TextFile) ->
-    log_to_txt(Log, false, FileName, Dir, Mibs, TextFile).
+    log_to_txt(Log, ?BLOCK_DEFAULT, FileName, Dir, Mibs, TextFile).
 %% </BACKWARD-COMPAT>
 
 log_to_txt(Log, Block, FileName, Dir, Mibs, TextFile) 
@@ -408,7 +409,7 @@ log_to_txt(Log, Block, FileName, Dir, Mibs, TextFile)
     log_to_txt(Log, Block, FileName, Dir, Mibs, TextFile, null, null);
 %% <BACKWARD-COMPAT>
 log_to_txt(Log, FileName, Dir, Mibs, TextFile, Start) ->
-    log_to_txt(Log, false, FileName, Dir, Mibs, TextFile, Start, null).
+    log_to_txt(Log, ?BLOCK_DEFAULT, FileName, Dir, Mibs, TextFile, Start, null).
 %% </BACKWARD-COMPAT>
 
 log_to_txt(Log, Block, FileName, Dir, Mibs, TextFile, Start) 
@@ -416,7 +417,7 @@ log_to_txt(Log, Block, FileName, Dir, Mibs, TextFile, Start)
     log_to_txt(Log, Block, FileName, Dir, Mibs, TextFile, Start, null);
 %% <BACKWARD-COMPAT>
 log_to_txt(Log, FileName, Dir, Mibs, TextFile, Start, Stop) ->
-    log_to_txt(Log, false, FileName, Dir, Mibs, TextFile, Start, Stop).
+    log_to_txt(Log, ?BLOCK_DEFAULT, FileName, Dir, Mibs, TextFile, Start, Stop).
 %% </BACKWARD-COMPAT>
 
 log_to_txt(Log, Block, FileName, Dir, Mibs, TextFile, Start, Stop) 
@@ -443,7 +444,7 @@ log_to_txt(Log, Block, FileName, Dir, Mibs, TextFile, Start, Stop)
 
 %% <BACKWARD-COMPAT>
 log_to_io(Log, FileName, Dir, Mibs) ->
-    log_to_io(Log, false, FileName, Dir, Mibs, null, null).
+    log_to_io(Log, ?BLOCK_DEFAULT, FileName, Dir, Mibs, null, null).
 %% </BACKWARD-COMPAT>
 
 log_to_io(Log, Block, FileName, Dir, Mibs) 
@@ -451,7 +452,7 @@ log_to_io(Log, Block, FileName, Dir, Mibs)
     log_to_io(Log, Block, FileName, Dir, Mibs, null, null); 
 %% <BACKWARD-COMPAT>
 log_to_io(Log, FileName, Dir, Mibs, Start) ->
-    log_to_io(Log, false, FileName, Dir, Mibs, Start, null).
+    log_to_io(Log, ?BLOCK_DEFAULT, FileName, Dir, Mibs, Start, null).
 %% </BACKWARD-COMPAT>
 
 log_to_io(Log, Block, FileName, Dir, Mibs, Start) 
@@ -459,7 +460,7 @@ log_to_io(Log, Block, FileName, Dir, Mibs, Start)
     log_to_io(Log, Block, FileName, Dir, Mibs, Start, null); 
 %% <BACKWARD-COMPAT>
 log_to_io(Log, FileName, Dir, Mibs, Start, Stop) ->
-    log_to_io(Log, false, FileName, Dir, Mibs, Start, Stop).
+    log_to_io(Log, ?BLOCK_DEFAULT, FileName, Dir, Mibs, Start, Stop).
 %% </BACKWARD-COMPAT>
 
 log_to_io(Log, Block, FileName, Dir, Mibs, Start, Stop)