Fix warnings

radekdoulik · Sep 13, 2024 · f4d584e · f4d584e
1 parent c4f7aee
commit f4d584e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/Extensions.cs b/Extensions.cs
@@ -2,7 +2,7 @@
 {
     public static class Extensions
     {
-        public static string Indent(this string str, string indent)
+        public static string Indent(this string str, string? indent)
         {
             return indent + str.Replace("\n", "\n" + indent);
         }

diff --git a/WasmReader.cs b/WasmReader.cs
@@ -1355,9 +1355,9 @@ void ReadFunctionSection()
             return name;
         }
 
-        public bool GetFunctionIdx(string name, out UInt32 idx)
+        public bool GetFunctionIdx(string? name, out UInt32 idx)
         {
-            if (!nameToFunction.ContainsKey(name))
+            if (name == null || !nameToFunction.ContainsKey(name))
             {
                 idx = 0;
                 return false;
@@ -1434,7 +1434,6 @@ protected void PrintFunctionWithPrefix(UInt32 idx, string? name, string? prefix
             if (functions == null || functionTypes == null || funcsCode == null)
                 return;
 
-            //Console.WriteLine($"read func {name}");
             var type = functionTypes[functions[idx].TypeIdx];
             Console.WriteLine($"{prefix}{type.ToString(name, true)}\n{funcsCode[idx].ToString(this, type.Parameters.Types.Length).Indent(prefix)}");
         }

diff --git a/WasmStructs.cs b/WasmStructs.cs
@@ -159,7 +159,7 @@ public string ToString(WasmReader? reader)
             }
         }
 
-        static string FunctionName(UInt32 idx, WasmReader? reader)
+        static string? FunctionName(UInt32 idx, WasmReader? reader)
         {
             if (reader == null)
                 return $"[{idx.ToString()}]";
@@ -310,8 +310,8 @@ struct LocalsBlock
 
         public string ToString(int idx)
         {
-            string varName = idx == -1 ? null : $" ${idx}";
-            string count = Count == 1 ? null : $" {Count}";
+            string? varName = idx == -1 ? null : $" ${idx}";
+            string? count = Count == 1 ? null : $" {Count}";
             return $"local{varName}{count} {Type}";
         }
 

diff --git a/wa-diff/WasmDiffReader.cs b/wa-diff/WasmDiffReader.cs
@@ -98,7 +98,7 @@ void CompareDisassembledFunctions(UInt32 idx, string? name, object? data)
             {
                 otherName = otherReader.GetFunctionName(otherIdx);
                 f2 = otherReader.functions[otherIdx];
-                processedIndexes.Add(otherIdx);
+                processedIndexes?.Add(otherIdx);
             }
 
             if (f2 == null)
@@ -226,7 +226,7 @@ void CompareFunctionSizes(UInt32 idx, string? name, object? data)
             {
                 otherName = otherReader.GetFunctionName(otherIdx);
                 f2 = otherReader.functions[otherIdx];
-                processedIndexes.Add(otherIdx);
+                processedIndexes?.Add(otherIdx);
             }
 
             if (f2 == null)
@@ -241,7 +241,7 @@ void CompareFunctionSizes(UInt32 idx, string? name, object? data)
                 sizeDiffs[$" {name}"] = delta;
         }
 
-        static bool GetOtherIndex(string name, uint idx, WasmDiffReader other, out uint otherIdx)
+        static bool GetOtherIndex(string? name, uint idx, WasmDiffReader other, out uint otherIdx)
         {
             otherIdx = idx;
             return other.HasFunctionNames && other.GetFunctionIdx(name, out otherIdx);
@@ -276,7 +276,7 @@ public int CompareFunctions(WasmReader other)
             return 0;
         }
 
-        HashSet<uint> processedIndexes;
+        HashSet<uint>? processedIndexes;
 
         protected override void FilterFunctions(ProcessFunction processFunction, object? data = null)
         {