From 42734394b0ec238c88bc3ef09454df411b8f3776 Mon Sep 17 00:00:00 2001
From: Derek <crq@kernel.org>
Date: Fri, 16 May 2014 16:46:22 -0700
Subject: [PATCH] Remove Trailing Whitespace in User-Agent

After removed, the User-Agent shows in log like this:

[debug] http.go:160 https://index.docker.io/v1/repositories/busybox/images --
HEADERS: map[User-Agent:[docker/0.11.1-dev go/go1.2.2 git-commit/8887e00-dirty kernel/3.14.3-n1 os/linux arch/amd64]]

The code also moved all validation work into validVersion,
to keep the main logic as clean.

Docker-DCO-1.1-Signed-off-by: Derek <crq@kernel.org> (github: crquan)
---
 utils/http.go | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/utils/http.go b/utils/http.go
index 68e93d8eb9..e193633792 100644
--- a/utils/http.go
+++ b/utils/http.go
@@ -1,7 +1,6 @@
 package utils
 
 import (
-	"bytes"
 	"io"
 	"net/http"
 	"strings"
@@ -15,11 +14,13 @@ type VersionInfo interface {
 }
 
 func validVersion(version VersionInfo) bool {
-	stopChars := " \t\r\n/"
-	if strings.ContainsAny(version.Name(), stopChars) {
+	const stopChars = " \t\r\n/"
+	name := version.Name()
+	vers := version.Version()
+	if len(name) == 0 || strings.ContainsAny(name, stopChars) {
 		return false
 	}
-	if strings.ContainsAny(version.Version(), stopChars) {
+	if len(vers) == 0 || strings.ContainsAny(vers, stopChars) {
 		return false
 	}
 	return true
@@ -36,27 +37,18 @@ func appendVersions(base string, versions ...VersionInfo) string {
 		return base
 	}
 
-	var buf bytes.Buffer
+	verstrs := make([]string, 0, 1+len(versions))
 	if len(base) > 0 {
-		buf.Write([]byte(base))
+		verstrs = append(verstrs, base)
 	}
 
 	for _, v := range versions {
-		name := []byte(v.Name())
-		version := []byte(v.Version())
-
-		if len(name) == 0 || len(version) == 0 {
-			continue
-		}
 		if !validVersion(v) {
 			continue
 		}
-		buf.Write([]byte(v.Name()))
-		buf.Write([]byte("/"))
-		buf.Write([]byte(v.Version()))
-		buf.Write([]byte(" "))
+		verstrs = append(verstrs, v.Name()+"/"+v.Version())
 	}
-	return buf.String()
+	return strings.Join(verstrs, " ")
 }
 
 // HTTPRequestDecorator is used to change an instance of