From cfe55f84f0543655a5fbb5c5371d240cdb8faddd Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Tue, 19 Dec 2023 10:56:44 +0100 Subject: [PATCH] [bgen] Fix generated code to be nullability correct. (#19655) This fixes a few warnings in the generated code. --- src/bgen/Generator.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bgen/Generator.cs b/src/bgen/Generator.cs index 1bb0af98c7f9..e883bf8f2b4c 100644 --- a/src/bgen/Generator.cs +++ b/src/bgen/Generator.cs @@ -3330,15 +3330,15 @@ void GenerateTypeLowering (MethodInfo mi, bool null_allowed_override, out String if (pi.IsOut) { by_ref_init.AppendFormat ("{1} {0}Value = IntPtr.Zero;\n", pi.Name.GetSafeParamName (), NativeHandleType); } else { - by_ref_init.AppendFormat ("{1} {0}Value = ", pi.Name.GetSafeParamName (), NativeHandleType); + by_ref_init.AppendFormat ("var {0}Value = ", pi.Name.GetSafeParamName ()); if (isString) { by_ref_init.AppendFormat ("NSString.CreateNative ({0}, true);\n", pi.Name.GetSafeParamName ()); - by_ref_init.AppendFormat ("{1} {0}OriginalValue = {0}Value;\n", pi.Name.GetSafeParamName (), NativeHandleType); + by_ref_init.AppendFormat ("var {0}OriginalValue = {0}Value;\n", pi.Name.GetSafeParamName ()); } else if (isArrayOfNSObject || isArrayOfINativeObjectSubclass) { by_ref_init.Insert (0, string.Format ("NSArray {0}ArrayValue = NSArray.FromNSObjects ({0});\n", pi.Name.GetSafeParamName ())); by_ref_init.AppendFormat ("{0}ArrayValue is null ? NativeHandle.Zero : {0}ArrayValue.Handle;\n", pi.Name.GetSafeParamName ()); } else if (isArrayOfString) { - by_ref_init.Insert (0, string.Format ("NSArray {0}ArrayValue = {0} is null ? null : NSArray.FromStrings ({0});\n", pi.Name.GetSafeParamName ())); + by_ref_init.Insert (0, string.Format ("NSArray? {0}ArrayValue = {0} is null ? null : NSArray.FromStrings ({0});\n", pi.Name.GetSafeParamName ())); by_ref_init.AppendFormat ("{0}ArrayValue is null ? NativeHandle.Zero : {0}ArrayValue.Handle;\n", pi.Name.GetSafeParamName ()); } else if (isNSObject || isINativeObjectSubclass) { by_ref_init.AppendFormat ("{0} is null ? NativeHandle.Zero : {0}.Handle;\n", pi.Name.GetSafeParamName ());