From ff40d2d787d2fb8c8d83612cb02aa32d70e6a241 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 1 Jun 2023 13:38:45 +0200 Subject: [PATCH] dockerversion: simplify escapeStr() Use a const for the characters to escape, instead of implementing this as a generic escaping function. Signed-off-by: Sebastiaan van Stijn --- dockerversion/useragent.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dockerversion/useragent.go b/dockerversion/useragent.go index 7fc3b69a75..bd65800e99 100644 --- a/dockerversion/useragent.go +++ b/dockerversion/useragent.go @@ -69,8 +69,10 @@ func getUserAgentFromContext(ctx context.Context) string { return upstreamUA } +const charsToEscape = `();\` + // escapeStr returns s with every rune in charsToEscape escaped by a backslash -func escapeStr(s string, charsToEscape string) string { +func escapeStr(s string) string { var ret string for _, currRune := range s { appended := false @@ -93,7 +95,5 @@ func escapeStr(s string, charsToEscape string) string { // // $dockerUA UpstreamClient($upstreamUA) func insertUpstreamUserAgent(upstreamUA string, dockerUA string) string { - charsToEscape := `();\` - upstreamUAEscaped := escapeStr(upstreamUA, charsToEscape) - return fmt.Sprintf("%s UpstreamClient(%s)", dockerUA, upstreamUAEscaped) + return fmt.Sprintf("%s UpstreamClient(%s)", dockerUA, escapeStr(upstreamUA)) }