Skip to content

Commit

Permalink
Merge pull request #232 from fwacrtnty/master
Browse files Browse the repository at this point in the history
avoid CS0104 error on linux, make namespaces unabiguous
EricZimmerman authored Oct 27, 2023
2 parents 28d8664 + 4239391 commit 278496d
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions EvtxECmd/Program.cs
Original file line number Diff line number Diff line change
@@ -555,14 +555,14 @@ private static void DoWork(string f, string d, string csv, string csvf, string j
else
{
Log.Debug("Loading maps from {Path}",Path.GetFullPath(maps));
var errors = EventLog.LoadMaps(Path.GetFullPath(maps));
var errors = evtx.EventLog.LoadMaps(Path.GetFullPath(maps));

if (errors)
{
return;
}

Log.Information("Maps loaded: {Count:N0}",EventLog.EventLogMaps.Count);
Log.Information("Maps loaded: {Count:N0}",evtx.EventLog.EventLogMaps.Count);
}

_includeIds = new HashSet<int>();
@@ -634,7 +634,7 @@ private static void DoWork(string f, string d, string csv, string csvf, string j
Console.WriteLine();
}

EventLog.TimeDiscrepancyThreshold = tdt;
evtx.EventLog.TimeDiscrepancyThreshold = tdt;

if (f.IsNullOrEmpty() == false)
{
@@ -649,7 +649,7 @@ private static void DoWork(string f, string d, string csv, string csvf, string j
{
//no need for maps
Log.Debug("Clearing map collection since no output specified");
EventLog.EventLogMaps.Clear();
evtx.EventLog.EventLogMaps.Clear();
}

dedupe = false;
@@ -719,7 +719,7 @@ private static void DoWork(string f, string d, string csv, string csvf, string j
{
//no need for maps
Log.Debug("Clearing map collection since no output specified");
EventLog.EventLogMaps.Clear();
evtx.EventLog.EventLogMaps.Clear();
}

foreach (var file in files2)
@@ -1035,8 +1035,8 @@ private static void ProcessFile(string file, bool dedupe, bool fj, bool met)
SeenHashes.Add(sha);
}

EventLog.LastSeenTicks = 0;
var evt = new EventLog(fileS);
evtx.EventLog.LastSeenTicks = 0;
var evt = new evtx.EventLog(fileS);

Log.Information("Chunk count: {ChunkCount:N0}, Iterating records...",evt.ChunkCount);

0 comments on commit 278496d

Please sign in to comment.