From ce849d312f5e4de5ea42fe9c21b683c405fe6592 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Wed, 15 Jun 2022 17:19:25 -0700 Subject: [PATCH] Fix naming in GSF --- .../External/libgsf/Input/GsfInfileMSOle.cs | 16 ++++++++-------- .../External/libgsf/Input/GsfInfileMSVBA.cs | 4 ++-- .../External/libgsf/Output/GsfOutfileMSOle.cs | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/BurnOutSharp/External/libgsf/Input/GsfInfileMSOle.cs b/BurnOutSharp/External/libgsf/Input/GsfInfileMSOle.cs index 5a8f3a6a..d355f0db 100644 --- a/BurnOutSharp/External/libgsf/Input/GsfInfileMSOle.cs +++ b/BurnOutSharp/External/libgsf/Input/GsfInfileMSOle.cs @@ -224,7 +224,7 @@ namespace LibGSF.Input #endregion } - public class GsfInfileMSOLE : GsfInfile + public class GsfInfileMSOle : GsfInfile { #region Properties @@ -247,7 +247,7 @@ namespace LibGSF.Input /// /// Destructor /// - ~GsfInfileMSOLE() + ~GsfInfileMSOle() { if (Input != null) Input = null; @@ -266,7 +266,7 @@ namespace LibGSF.Input #region Functions - protected override GsfInput DupImpl(ref Exception err) => (Container as GsfInfileMSOLE).CreateChild(DirectoryEntry, ref err); + protected override GsfInput DupImpl(ref Exception err) => (Container as GsfInfileMSOle).CreateChild(DirectoryEntry, ref err); protected override byte[] ReadImpl(int num_bytes, byte[] optional_buffer, int optional_buffer_ptr) { @@ -402,7 +402,7 @@ namespace LibGSF.Input /// This adds a reference to . public static GsfInfile Create(GsfInput source, ref Exception err) { - GsfInfileMSOLE ole = new GsfInfileMSOLE + GsfInfileMSOle ole = new GsfInfileMSOle { Input = source, Size = 0, @@ -533,7 +533,7 @@ namespace LibGSF.Input return null; // Avoid creating a circular reference - ((GsfInfileMSOLE)Info.SmallBlockFile).Info.Unref(); + ((GsfInfileMSOle)Info.SmallBlockFile).Info.Unref(); if (Info.SmallBlock.Bat.Block != null) return null; @@ -554,7 +554,7 @@ namespace LibGSF.Input private GsfInput CreateChild(MSOLEDirectoryEntry dirent, ref Exception err) { - GsfInfileMSOLE child = PartiallyDuplicate(ref err); + GsfInfileMSOle child = PartiallyDuplicate(ref err); if (child == null) return null; @@ -756,7 +756,7 @@ namespace LibGSF.Input /// Utility routine to _partially_ replicate a file. It does NOT copy the bat /// blocks, or init the dirent. /// - private GsfInfileMSOLE PartiallyDuplicate(ref Exception err) + private GsfInfileMSOle PartiallyDuplicate(ref Exception err) { GsfInput input = Input.Duplicate(ref err); if (input == null) @@ -765,7 +765,7 @@ namespace LibGSF.Input return null; } - GsfInfileMSOLE dst = new GsfInfileMSOLE(); + GsfInfileMSOle dst = new GsfInfileMSOle(); dst.Input = input; dst.Info = Info.Ref(); // buf and buf_size are initialized to null diff --git a/BurnOutSharp/External/libgsf/Input/GsfInfileMSVBA.cs b/BurnOutSharp/External/libgsf/Input/GsfInfileMSVBA.cs index 2a290f1a..ac1d67f5 100644 --- a/BurnOutSharp/External/libgsf/Input/GsfInfileMSVBA.cs +++ b/BurnOutSharp/External/libgsf/Input/GsfInfileMSVBA.cs @@ -115,7 +115,7 @@ namespace LibGSF.Input GsfInput vba = null; GsfInfile infile; - if ((infile = GsfInfileMSOLE.Create(input, ref err)) != null) + if ((infile = GsfInfileMSOle.Create(input, ref err)) != null) { // 1) Try XLS vba = infile.ChildByVariableName("_VBA_PROJECT_CUR", "VBA"); @@ -134,7 +134,7 @@ namespace LibGSF.Input GsfInput vba_stream = main_part.RelationByType("http://schemas.microsoft.com/office/2006/relationships/vbaProject", ref err); if (vba_stream != null) { - GsfInfile ole = GsfInfileMSOLE.Create(vba_stream, ref err); + GsfInfile ole = GsfInfileMSOle.Create(vba_stream, ref err); if (ole != null) vba = ole.ChildByVariableName("VBA"); } diff --git a/BurnOutSharp/External/libgsf/Output/GsfOutfileMSOle.cs b/BurnOutSharp/External/libgsf/Output/GsfOutfileMSOle.cs index ed6001ad..0f5b188a 100644 --- a/BurnOutSharp/External/libgsf/Output/GsfOutfileMSOle.cs +++ b/BurnOutSharp/External/libgsf/Output/GsfOutfileMSOle.cs @@ -918,7 +918,7 @@ namespace LibGSF.Output Content_Dir_RootOrder.Add(child); } - private static int NameCompare(GsfOutfileMSOle a, GsfOutfileMSOle b) => GsfInfileMSOLE.SortingKeyCompare(a.Key, b.Key); + private static int NameCompare(GsfOutfileMSOle a, GsfOutfileMSOle b) => GsfInfileMSOle.SortingKeyCompare(a.Key, b.Key); private void MakeSortingName() {