all: use strings.EqualFold for string comparison (#24890)
This commit is contained in:
parent
e0a9752b96
commit
e644d45c14
@ -143,7 +143,7 @@ func (p *terminalPrompter) PromptPassword(prompt string) (passwd string, err err
|
|||||||
// choice to be made, returning that choice.
|
// choice to be made, returning that choice.
|
||||||
func (p *terminalPrompter) PromptConfirm(prompt string) (bool, error) {
|
func (p *terminalPrompter) PromptConfirm(prompt string) (bool, error) {
|
||||||
input, err := p.Prompt(prompt + " [y/n] ")
|
input, err := p.Prompt(prompt + " [y/n] ")
|
||||||
if len(input) > 0 && strings.ToUpper(input[:1]) == "Y" {
|
if len(input) > 0 && strings.EqualFold(input[:1], "y") {
|
||||||
return true, nil
|
return true, nil
|
||||||
}
|
}
|
||||||
return false, err
|
return false, err
|
||||||
|
@ -243,12 +243,12 @@ func (c *Compiler) pushBin(v interface{}) {
|
|||||||
// isPush returns whether the string op is either any of
|
// isPush returns whether the string op is either any of
|
||||||
// push(N).
|
// push(N).
|
||||||
func isPush(op string) bool {
|
func isPush(op string) bool {
|
||||||
return strings.ToUpper(op) == "PUSH"
|
return strings.EqualFold(op, "PUSH")
|
||||||
}
|
}
|
||||||
|
|
||||||
// isJump returns whether the string op is jump(i)
|
// isJump returns whether the string op is jump(i)
|
||||||
func isJump(op string) bool {
|
func isJump(op string) bool {
|
||||||
return strings.ToUpper(op) == "JUMPI" || strings.ToUpper(op) == "JUMP"
|
return strings.EqualFold(op, "JUMPI") || strings.EqualFold(op, "JUMP")
|
||||||
}
|
}
|
||||||
|
|
||||||
// toBinary converts text to a vm.OpCode
|
// toBinary converts text to a vm.OpCode
|
||||||
|
@ -357,7 +357,7 @@ func (h *httpServer) wsAllowed() bool {
|
|||||||
|
|
||||||
// isWebsocket checks the header of an http request for a websocket upgrade request.
|
// isWebsocket checks the header of an http request for a websocket upgrade request.
|
||||||
func isWebsocket(r *http.Request) bool {
|
func isWebsocket(r *http.Request) bool {
|
||||||
return strings.ToLower(r.Header.Get("Upgrade")) == "websocket" &&
|
return strings.EqualFold(r.Header.Get("Upgrade"), "websocket") &&
|
||||||
strings.Contains(strings.ToLower(r.Header.Get("Connection")), "upgrade")
|
strings.Contains(strings.ToLower(r.Header.Get("Connection")), "upgrade")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -283,7 +283,7 @@ func rpcRequest(t *testing.T, url string, extraHeaders ...string) *http.Response
|
|||||||
}
|
}
|
||||||
for i := 0; i < len(extraHeaders); i += 2 {
|
for i := 0; i < len(extraHeaders); i += 2 {
|
||||||
key, value := extraHeaders[i], extraHeaders[i+1]
|
key, value := extraHeaders[i], extraHeaders[i+1]
|
||||||
if strings.ToLower(key) == "host" {
|
if strings.EqualFold(key, "host") {
|
||||||
req.Host = value
|
req.Host = value
|
||||||
} else {
|
} else {
|
||||||
req.Header.Set(key, value)
|
req.Header.Set(key, value)
|
||||||
|
Loading…
Reference in New Issue
Block a user