Skip to content

Commit 4d7c4db

Browse files
cincuranetcincuranet
committed
Using out var.
1 parent e9ef218 commit 4d7c4db

16 files changed

Lines changed: 61 additions & 131 deletions

‎Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/SrpClient.cs‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,8 @@ public Tuple<BigInteger, BigInteger> ServerSeed(string user, string password, by
9090
var v = BigInteger.ModPow(g, GetUserHash(user, password, salt), N);
9191
var b = GetSecret();
9292
var gb = BigInteger.ModPow(g, b, N);
93-
var kv = default(BigInteger);
94-
BigInteger.DivRem(k * v, N, out kv);
95-
var B = default(BigInteger);
96-
BigInteger.DivRem(BigInteger.Add(kv, gb), N, out B);
93+
BigInteger.DivRem(k * v, N, out var kv);
94+
BigInteger.DivRem(BigInteger.Add(kv, gb), N, out var B);
9795
return Tuple.Create(B, b);
9896
}
9997

@@ -102,8 +100,7 @@ public byte[] GetServerSessionKey(string user, string password, byte[] salt, Big
102100
var u = GetScramble(A, B);
103101
var v = BigInteger.ModPow(g, GetUserHash(user, password, salt), N);
104102
var vu = BigInteger.ModPow(v, u, N);
105-
var Avu = default(BigInteger);
106-
BigInteger.DivRem(A * vu, N, out Avu);
103+
BigInteger.DivRem(A * vu, N, out var Avu);
107104
var sessionSecret = BigInteger.ModPow(Avu, b, N);
108105
return ComputeHash(BigIntegerToByteArray(sessionSecret));
109106
}
@@ -123,19 +120,15 @@ private byte[] GetClientSessionKey(string user, string password, byte[] salt, Bi
123120
var u = GetScramble(PublicKey, serverPublicKey);
124121
var x = GetUserHash(user, password, salt);
125122
var gx = BigInteger.ModPow(g, x, N);
126-
var kgx = default(BigInteger);
127-
BigInteger.DivRem(k * gx, N, out kgx);
123+
BigInteger.DivRem(k * gx, N, out var kgx);
128124
var Bkgx = serverPublicKey - kgx;
129125
if (Bkgx < 0)
130126
{
131127
Bkgx = Bkgx + N;
132128
}
133-
var diff = default(BigInteger);
134-
BigInteger.DivRem(Bkgx, N, out diff);
135-
var ux = default(BigInteger);
136-
BigInteger.DivRem(u * x, N, out ux);
137-
var aux = default(BigInteger);
138-
BigInteger.DivRem(PrivateKey + ux, N, out aux);
129+
BigInteger.DivRem(Bkgx, N, out var diff);
130+
BigInteger.DivRem(u * x, N, out var ux);
131+
BigInteger.DivRem(PrivateKey + ux, N, out var aux);
139132
var sessionSecret = BigInteger.ModPow(diff, aux, N);
140133
return ComputeHash(BigIntegerToByteArray(sessionSecret));
141134
}

‎Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/SspiHelper.cs‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -306,10 +306,9 @@ public SspiHelper(string securityPackage, string remotePrincipal)
306306
_securPackage = securityPackage;
307307
_remotePrincipal = remotePrincipal;
308308
_clientCredentials = new SecHandle();
309-
SecInteger expiry = new SecInteger();
310309
int resCode = AcquireCredentialsHandle(null, securityPackage, SECPKG_CRED_OUTBOUND,
311310
IntPtr.Zero, IntPtr.Zero, 0, IntPtr.Zero,
312-
out _clientCredentials, out expiry);
311+
out _clientCredentials, out var expiry);
313312
if (resCode != SEC_E_OK)
314313
throw new Exception($"{nameof(AcquireCredentialsHandle)} failed");
315314
}
@@ -327,8 +326,6 @@ public byte[] InitializeClientSecurity()
327326
EnsureDisposed();
328327
CloseClientContext();
329328
_clientContext = new SecHandle();
330-
SecInteger expiry = new SecInteger();
331-
uint contextAttributes;
332329
SecBufferDesc clientTokenBuf = new SecBufferDesc(MAX_TOKEN_SIZE);
333330
try
334331
{
@@ -343,8 +340,8 @@ public byte[] InitializeClientSecurity()
343340
0,
344341
out _clientContext,
345342
ref clientTokenBuf,
346-
out contextAttributes,
347-
out expiry);
343+
out var contextAttributes,
344+
out var expiry);
348345
if (resCode != SEC_E_OK && resCode != SEC_I_CONTINUE_NEEDED)
349346
throw new Exception($"{nameof(InitializeSecurityContext)} failed");
350347
return clientTokenBuf.GetSecBufferBytes();
@@ -367,8 +364,6 @@ public byte[] GetClientSecurity(byte[] serverToken)
367364
EnsureDisposed();
368365
if (_clientContext.IsInvalid)
369366
throw new InvalidOperationException($"{nameof(InitializeClientSecurity)} not called");
370-
SecInteger expiry = new SecInteger();
371-
uint contextAttributes;
372367
SecBufferDesc clientTokenBuf = new SecBufferDesc(MAX_TOKEN_SIZE);
373368
try
374369
{
@@ -386,8 +381,8 @@ public byte[] GetClientSecurity(byte[] serverToken)
386381
0,
387382
out _clientContext,
388383
ref clientTokenBuf,
389-
out contextAttributes,
390-
out expiry);
384+
out var contextAttributes,
385+
out var expiry);
391386
if (resCode != SEC_E_OK && resCode != SEC_I_CONTINUE_NEEDED)
392387
throw new Exception($"{nameof(InitializeSecurityContext)} failed");
393388
return clientTokenBuf.GetSecBufferBytes();

‎Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsDatabase.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -437,10 +437,7 @@ public void QueueEvents(RemoteEvent events)
437437
{
438438
if (_eventManager == null)
439439
{
440-
string ipAddress;
441-
int portNumber;
442-
int auxHandle;
443-
ConnectionRequest(out auxHandle, out ipAddress, out portNumber);
440+
ConnectionRequest(out var auxHandle, out var ipAddress, out var portNumber);
444441
_eventManager = new GdsEventManager(auxHandle, ipAddress, portNumber);
445442
}
446443
try

‎Provider/src/FirebirdSql.Data.FirebirdClient/Common/Charset.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,14 @@ public static Charset DefaultCharset
5454

5555
public static Charset GetCharset(int charsetId)
5656
{
57-
var value = default(Charset);
58-
if (charsetsById.TryGetValue(charsetId, out value))
57+
if (charsetsById.TryGetValue(charsetId, out var value))
5958
return value;
6059
return null;
6160
}
6261

6362
public static Charset GetCharset(string charsetName)
6463
{
65-
var value = default(Charset);
66-
if (charsetsByName.TryGetValue(charsetName, out value))
64+
if (charsetsByName.TryGetValue(charsetName, out var value))
6765
return value;
6866
return null;
6967
}

‎Provider/src/FirebirdSql.Data.FirebirdClient/Common/IscException.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,7 @@ private string BuildDefaultErrorMessage(int code)
233233

234234
private static string GetValueOrDefault(IDictionary<int, string> dictionary, int key, Func<int, string> defaultValueFactory)
235235
{
236-
string result;
237-
if (!dictionary.TryGetValue(key, out result))
236+
if (!dictionary.TryGetValue(key, out var result))
238237
{
239238
result = defaultValueFactory(key);
240239
}

‎Provider/src/FirebirdSql.Data.FirebirdClient/Entity/MetadataHelpers.cs‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,7 @@ internal static bool TryGetPrimitiveTypeKind(TypeUsage type, out PrimitiveTypeKi
175175

176176
internal static PrimitiveTypeKind GetPrimitiveTypeKind(TypeUsage type)
177177
{
178-
PrimitiveTypeKind returnValue;
179-
if (!MetadataHelpers.TryGetPrimitiveTypeKind(type, out returnValue))
178+
if (!MetadataHelpers.TryGetPrimitiveTypeKind(type, out var returnValue))
180179
{
181180
Debug.Assert(false, "Cannot create parameter of non-primitive type");
182181
throw new NotSupportedException("Cannot create parameter of non-primitive type");
@@ -193,8 +192,7 @@ internal static PrimitiveTypeKind GetPrimitiveTypeKind(TypeUsage type)
193192
/// <returns></returns>
194193
internal static T TryGetValueForMetadataProperty<T>(MetadataItem item, string propertyName)
195194
{
196-
MetadataProperty property;
197-
if (!item.MetadataProperties.TryGetValue(propertyName, true, out property))
195+
if (!item.MetadataProperties.TryGetValue(propertyName, true, out var property))
198196
{
199197
return default(T);
200198
}
@@ -204,8 +202,7 @@ internal static T TryGetValueForMetadataProperty<T>(MetadataItem item, string pr
204202

205203
internal static bool IsPrimitiveType(TypeUsage type, PrimitiveTypeKind primitiveType)
206204
{
207-
PrimitiveTypeKind typeKind;
208-
if (TryGetPrimitiveTypeKind(type, out typeKind))
205+
if (TryGetPrimitiveTypeKind(type, out var typeKind))
209206
{
210207
return (typeKind == primitiveType);
211208
}
@@ -281,8 +278,7 @@ internal static bool IsPrimitiveType(TypeUsage type, PrimitiveTypeKind primitive
281278
internal static T GetFacetValueOrDefault<T>(TypeUsage type, string facetName, T defaultValue)
282279
{
283280
//Get the value for the facet, if any
284-
Facet facet;
285-
if (type.Facets.TryGetValue(facetName, false, out facet) && facet.Value != null && !facet.IsUnbounded)
281+
if (type.Facets.TryGetValue(facetName, false, out var facet) && facet.Value != null && !facet.IsUnbounded)
286282
{
287283
return (T)facet.Value;
288284
}
@@ -337,8 +333,7 @@ internal static bool TryGetTypeFacetDescriptionByName(EdmType edmType, string fa
337333

338334
internal static bool IsNullable(TypeUsage type)
339335
{
340-
Facet nullableFacet;
341-
if (type.Facets.TryGetValue(NullableFacetName, false, out nullableFacet))
336+
if (type.Facets.TryGetValue(NullableFacetName, false, out var nullableFacet))
342337
{
343338
return (bool)nullableFacet.Value;
344339
}
@@ -361,9 +356,8 @@ internal static bool TryGetMaxLength(TypeUsage type, out int? maxLength)
361356
internal static bool TryGetIntFacetValue(TypeUsage type, string facetName, out int? intValue)
362357
{
363358
intValue = 0;
364-
Facet intFacet;
365359

366-
if (type.Facets.TryGetValue(facetName, false, out intFacet) && intFacet.Value != null)
360+
if (type.Facets.TryGetValue(facetName, false, out var intFacet) && intFacet.Value != null)
367361
{
368362
if (!intFacet.IsUnbounded)
369363
intValue = (int)intFacet.Value;
@@ -391,8 +385,7 @@ internal static bool TryGetIsFixedLength(TypeUsage type, out bool isFixedLength)
391385
internal static bool TryGetBooleanFacetValue(TypeUsage type, string facetName, out bool boolValue)
392386
{
393387
boolValue = false;
394-
Facet boolFacet;
395-
if (type.Facets.TryGetValue(facetName, false, out boolFacet) && boolFacet.Value != null)
388+
if (type.Facets.TryGetValue(facetName, false, out var boolFacet) && boolFacet.Value != null)
396389
{
397390
boolValue = (bool)boolFacet.Value;
398391
return true;
@@ -459,8 +452,7 @@ internal static string GetTableName(EntitySetBase entitySetBase)
459452

460453
private static bool IsStoreGeneratedPattern(EdmMember member, StoreGeneratedPattern pattern)
461454
{
462-
Facet item = null;
463-
return (member.TypeUsage.Facets.TryGetValue(StoreGeneratedPatternFacetName, false, out item) && ((StoreGeneratedPattern)item.Value) == pattern);
455+
return (member.TypeUsage.Facets.TryGetValue(StoreGeneratedPatternFacetName, false, out var item) && ((StoreGeneratedPattern)item.Value) == pattern);
464456
}
465457
internal static bool IsStoreGeneratedComputed(EdmMember member)
466458
{

‎Provider/src/FirebirdSql.Data.FirebirdClient/Entity/SqlGenerator.cs‎

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -615,8 +615,7 @@ public override ISqlFragment Visit(DbConstantExpression e)
615615
{
616616
SqlBuilder result = new SqlBuilder();
617617

618-
PrimitiveTypeKind typeKind;
619-
if (MetadataHelpers.TryGetPrimitiveTypeKind(e.ResultType, out typeKind))
618+
if (MetadataHelpers.TryGetPrimitiveTypeKind(e.ResultType, out var typeKind))
620619
{
621620
switch (typeKind)
622621
{
@@ -668,9 +667,8 @@ public override ISqlFragment Visit(DbConstantExpression e)
668667
var pointPosition = strDecimal.IndexOf('.');
669668

670669
var precision = 9;
671-
FacetDescription precisionFacetDescription;
672670
// there's always the max value in manifest
673-
if (MetadataHelpers.TryGetTypeFacetDescriptionByName(e.ResultType.EdmType, MetadataHelpers.PrecisionFacetName, out precisionFacetDescription))
671+
if (MetadataHelpers.TryGetTypeFacetDescriptionByName(e.ResultType.EdmType, MetadataHelpers.PrecisionFacetName, out var precisionFacetDescription))
674672
{
675673
if (precisionFacetDescription.DefaultValue != null)
676674
precision = (int)precisionFacetDescription.DefaultValue;
@@ -750,9 +748,8 @@ public override ISqlFragment Visit(DbDistinctExpression e)
750748

751749
if (!IsCompatible(result, e.ExpressionKind))
752750
{
753-
Symbol fromSymbol;
754751
TypeUsage inputType = MetadataHelpers.GetElementTypeUsage(e.Argument.ResultType);
755-
result = CreateNewSelectStatement(result, "DISTINCT", inputType, out fromSymbol);
752+
result = CreateNewSelectStatement(result, "DISTINCT", inputType, out var fromSymbol);
756753
AddFromSymbol(result, "DISTINCT", fromSymbol, false);
757754
}
758755

@@ -979,10 +976,9 @@ public override ISqlFragment Visit(DbRefKeyExpression e)
979976
/// <returns>A <see cref="SqlSelectStatement"/></returns>
980977
public override ISqlFragment Visit(DbGroupByExpression e)
981978
{
982-
Symbol fromSymbol;
983979
string varName = GetShortenedName(e.Input.VariableName);
984980
SqlSelectStatement innerQuery = VisitInputExpression(e.Input.Expression,
985-
varName, e.Input.VariableType, out fromSymbol);
981+
varName, e.Input.VariableType, out var fromSymbol);
986982

987983
// GroupBy is compatible with Filter and OrderBy
988984
// but not with Project, GroupBy
@@ -1259,13 +1255,12 @@ public override ISqlFragment Visit(DbLimitExpression e)
12591255
Debug.Assert(e.Limit is DbConstantExpression || e.Limit is DbParameterReferenceExpression, "DbLimitExpression.Limit is of invalid expression type");
12601256

12611257
SqlSelectStatement result = VisitExpressionEnsureSqlStatement(e.Argument, false);
1262-
Symbol fromSymbol;
12631258

12641259
if (!IsCompatible(result, e.ExpressionKind))
12651260
{
12661261
TypeUsage inputType = MetadataHelpers.GetElementTypeUsage(e.Argument.ResultType);
12671262

1268-
result = CreateNewSelectStatement(result, "top", inputType, out fromSymbol);
1263+
result = CreateNewSelectStatement(result, "top", inputType, out var fromSymbol);
12691264
AddFromSymbol(result, "top", fromSymbol, false);
12701265
}
12711266

@@ -1413,9 +1408,8 @@ public override ISqlFragment Visit(DbParameterReferenceExpression e)
14131408
/// <seealso cref="Visit(DbFilterExpression)"/>
14141409
public override ISqlFragment Visit(DbProjectExpression e)
14151410
{
1416-
Symbol fromSymbol;
14171411
string varName = GetShortenedName(e.Input.VariableName);
1418-
SqlSelectStatement result = VisitInputExpression(e.Input.Expression, varName, e.Input.VariableType, out fromSymbol);
1412+
SqlSelectStatement result = VisitInputExpression(e.Input.Expression, varName, e.Input.VariableType, out var fromSymbol);
14191413

14201414
// Project is compatible with Filter
14211415
// but not with Project, GroupBy
@@ -1605,8 +1599,7 @@ public override ISqlFragment Visit(DbSkipExpression e)
16051599
Debug.Assert(e.Count is DbConstantExpression || e.Count is DbParameterReferenceExpression, "DbSkipExpression.Count is of invalid expression type");
16061600

16071601
string varName = GetShortenedName(e.Input.VariableName);
1608-
Symbol fromSymbol;
1609-
SqlSelectStatement result = VisitInputExpression(e.Input.Expression, varName, e.Input.VariableType, out fromSymbol);
1602+
SqlSelectStatement result = VisitInputExpression(e.Input.Expression, varName, e.Input.VariableType, out var fromSymbol);
16101603

16111604
if (!IsCompatible(result, e.ExpressionKind))
16121605
{
@@ -1641,9 +1634,8 @@ public override ISqlFragment Visit(DbSkipExpression e)
16411634
/// <seealso cref="Visit(DbFilterExpression)"/>
16421635
public override ISqlFragment Visit(DbSortExpression e)
16431636
{
1644-
Symbol fromSymbol;
16451637
string varName = GetShortenedName(e.Input.VariableName);
1646-
SqlSelectStatement result = VisitInputExpression(e.Input.Expression, varName, e.Input.VariableType, out fromSymbol);
1638+
SqlSelectStatement result = VisitInputExpression(e.Input.Expression, varName, e.Input.VariableType, out var fromSymbol);
16471639

16481640
// OrderBy is compatible with Filter
16491641
// and nothing else
@@ -1924,10 +1916,9 @@ private ISqlFragment VisitCollectionConstructor(DbNewInstanceExpression e)
19241916

19251917
if (!IsCompatible(result, DbExpressionKind.Element))
19261918
{
1927-
Symbol fromSymbol;
19281919
TypeUsage inputType = MetadataHelpers.GetElementTypeUsage(elementExpr.Argument.ResultType);
19291920

1930-
result = CreateNewSelectStatement(result, "element", inputType, out fromSymbol);
1921+
result = CreateNewSelectStatement(result, "element", inputType, out var fromSymbol);
19311922
AddFromSymbol(result, "element", fromSymbol, false);
19321923
}
19331924

@@ -2901,8 +2892,7 @@ void AddColumns(SqlSelectStatement selectStatement, Symbol symbol,
29012892
_allColumnNames[recordMemberName] = 0;
29022893

29032894
// Create a new symbol/reuse existing symbol for the column
2904-
Symbol columnSymbol;
2905-
if (!symbol.Columns.TryGetValue(recordMemberName, out columnSymbol))
2895+
if (!symbol.Columns.TryGetValue(recordMemberName, out var columnSymbol))
29062896
{
29072897
// we do not care about the types of columns, so we pass null
29082898
// when construction the symbol.
@@ -3512,7 +3502,6 @@ SqlSelectStatement VisitExpressionEnsureSqlStatement(DbExpression e, bool addDef
35123502
break;
35133503

35143504
default:
3515-
Symbol fromSymbol;
35163505
string inputVarName = "c"; // any name will do - this is my random choice.
35173506
_symbolTable.EnterScope();
35183507

@@ -3535,7 +3524,7 @@ SqlSelectStatement VisitExpressionEnsureSqlStatement(DbExpression e, bool addDef
35353524
break;
35363525
}
35373526

3538-
result = VisitInputExpression(e, inputVarName, type, out fromSymbol);
3527+
result = VisitInputExpression(e, inputVarName, type, out var fromSymbol);
35393528
AddFromSymbol(result, inputVarName, fromSymbol);
35403529
_symbolTable.ExitScope();
35413530
break;
@@ -3561,10 +3550,9 @@ SqlSelectStatement VisitExpressionEnsureSqlStatement(DbExpression e, bool addDef
35613550
/// <returns></returns>
35623551
SqlSelectStatement VisitFilterExpression(DbExpressionBinding input, DbExpression predicate, bool negatePredicate)
35633552
{
3564-
Symbol fromSymbol;
35653553
string varName = GetShortenedName(input.VariableName);
35663554
SqlSelectStatement result = VisitInputExpression(input.Expression,
3567-
varName, input.VariableType, out fromSymbol);
3555+
varName, input.VariableType, out var fromSymbol);
35683556

35693557
// Filter is compatible with OrderBy
35703558
// but not with Project, another Filter or GroupBy
@@ -3738,8 +3726,7 @@ static bool IsPropertyOverVarRef(DbExpression expression)
37383726
/// <returns></returns>
37393727
internal string GetShortenedName(string name)
37403728
{
3741-
string shortened;
3742-
if (!_shortenedNames.TryGetValue(name, out shortened))
3729+
if (!_shortenedNames.TryGetValue(name, out var shortened))
37433730
{
37443731
shortened = BuildName(_shortenedNames.Count);
37453732
_shortenedNames[name] = shortened;

0 commit comments

Comments
 (0)