From 34072cd030531fa5bc45e34dfea6a85e13e81ac5 Mon Sep 17 00:00:00 2001
From: Chandler M <chandlerjmclean@gmail.com>
Date: Sat, 24 Apr 2021 14:04:34 -0400
Subject: [PATCH] Update WinHttp for Au3Check compliance

Updated to have no issues with strictest Au3Check parameters: -d -w 1 -w 2-w 3 -w 4 -w 5 -w 6
Moved variable declarations to outside of loops and `If` statements
---
 WinHttp.au3 | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/WinHttp.au3 b/WinHttp.au3
index 216eea1..19f5384 100644
--- a/WinHttp.au3
+++ b/WinHttp.au3
@@ -2135,11 +2135,11 @@ Func __WinHttpHTML5FormAttribs(ByRef $aDtas, ByRef $aFlds, ByRef $iNumParams, By
 	; "name:whatever", "Xcoord,Ycoord"
 	; "id:whatever", "Xcoord,Ycoord"
 	; "whatever", "Xcoord,Ycoord"     ;<- same as "id:whatever"
-	Local $aSpl, $iSubmitHTML5 = 0, $iInpSubm, $sImgAppx = "."
+	Local $aSpl, $iSubmitHTML5 = 0, $iInpSubm, $sImgAppx = ".", $sInpNme, $sType, $iX = 0, $iY = 0, $aStrSplit
 	For $k = 1 To $iNumParams
 		$aSpl = StringSplit($aFlds[$k], ":", 2)
 		If $aSpl[0] = "type" And ($aSpl[1] = "submit" Or $aSpl[1] = "image") Then
-			Local $iSubmIndex = $aDtas[$k], $iSubmCur = 0, $iImgCur = 0, $sType, $sInpNme
+			Local $iSubmIndex = $aDtas[$k], $iSubmCur = 0, $iImgCur = 0
 			If $aSpl[1] = "image" Then
 				$iSubmIndex = Int($aDtas[$k])
 			EndIf
@@ -2159,7 +2159,6 @@ Func __WinHttpHTML5FormAttribs(ByRef $aDtas, ByRef $aFlds, ByRef $iNumParams, By
 							$sInpNme = __WinHttpAttribVal($aInput[$iInpSubm], "name")
 							If $sInpNme Then $sInpNme &= $sImgAppx
 							$aInput[$iInpSubm] = 'type="image" formaction="' & __WinHttpAttribVal($aInput[$iInpSubm], "formaction") & '" formenctype="' & __WinHttpAttribVal($aInput[$iInpSubm], "formenctype") & '" formmethod="' & __WinHttpAttribVal($aInput[$iInpSubm], "formmethod") & '"'
-							Local $iX = 0, $iY = 0
 							$iX = Int(StringRegExpReplace($aDtas[$k], "(\d+)\h*(\d+),(\d+)", "$2", 1))
 							$iY = Int(StringRegExpReplace($aDtas[$k], "(\d+)\h*(\d+),(\d+)", "$3", 1))
 							ReDim $aInput[UBound($aInput) + 2]
@@ -2171,7 +2170,7 @@ Func __WinHttpHTML5FormAttribs(ByRef $aDtas, ByRef $aFlds, ByRef $iNumParams, By
 				EndSwitch
 			Next
 		ElseIf $aSpl[0] = "name" Then
-			Local $sInpNme = $aSpl[1], $sType
+			$sInpNme = $aSpl[1]
 			For $i = 0 To UBound($aInput) - 1 ; for all input elements
 				$sType = __WinHttpAttribVal($aInput[$i], "type")
 				If $sType = "submit" Then
@@ -2184,7 +2183,7 @@ Func __WinHttpHTML5FormAttribs(ByRef $aDtas, ByRef $aFlds, ByRef $iNumParams, By
 					If __WinHttpAttribVal($aInput[$i], "name") = $sInpNme And $aDtas[$k] Then
 						$iSubmitHTML5 = 1
 						$iInpSubm = $i
-						Local $aStrSplit = StringSplit($aDtas[$k], ",", 3), $iX = 0, $iY = 0
+						$aStrSplit = StringSplit($aDtas[$k], ",", 3)
 						If Not @error Then
 							$iX = Int($aStrSplit[0])
 							$iY = Int($aStrSplit[1])
@@ -2199,7 +2198,7 @@ Func __WinHttpHTML5FormAttribs(ByRef $aDtas, ByRef $aFlds, ByRef $iNumParams, By
 				EndIf
 			Next
 		Else ; id
-			Local $sInpId, $sType
+			Local $sInpId
 			If @error Then
 				$sInpId = $aSpl[0]
 			ElseIf $aSpl[0] = "id" Then
@@ -2217,9 +2216,9 @@ Func __WinHttpHTML5FormAttribs(ByRef $aDtas, ByRef $aFlds, ByRef $iNumParams, By
 					If __WinHttpAttribVal($aInput[$i], "id") = $sInpId And $aDtas[$k] Then
 						$iSubmitHTML5 = 1
 						$iInpSubm = $i
-						Local $sInpNme = __WinHttpAttribVal($aInput[$iInpSubm], "name")
+						$sInpNme = __WinHttpAttribVal($aInput[$iInpSubm], "name")
 						If $sInpNme Then $sInpNme &= $sImgAppx
-						Local $aStrSplit = StringSplit($aDtas[$k], ",", 3), $iX = 0, $iY = 0
+						$aStrSplit = StringSplit($aDtas[$k], ",", 3)
 						If Not @error Then
 							$iX = Int($aStrSplit[0])
 							$iY = Int($aStrSplit[1])