1 files changed, 9 insertions, 11 deletions
diff --git a/src/hub/src/spreadspace.org/sfive/s5srvForward.go b/src/hub/src/spreadspace.org/sfive/s5srvForward.go
index 11709a1..bd16c78 100644
--- a/src/hub/src/spreadspace.org/sfive/s5srvForward.go
+++ b/src/hub/src/spreadspace.org/sfive/s5srvForward.go
@@ -40,9 +40,9 @@ import (
 	"time"
 )
 
-func findMaxId(values []UpdateFull) int {
+func findMaxId(updates []UpdateFull) int {
 	maxId := -1
-	for _, value := range values {
+	for _, value := range updates {
 		if id := value.SourceHubUpdateId; id > maxId {
 			maxId = id
 		}
@@ -50,11 +50,11 @@ func findMaxId(values []UpdateFull) int {
 	return maxId
 }
 
-func fwdGetLastUpdate(baseurl string, client *http.Client, hubUuid string) (lastId int, err error) {
+func fwdGetLastUpdateId(baseUrl string, client *http.Client, hubUuid string) (lastId int, err error) {
 	lastId = -1
 
 	var resp *http.Response
-	resp, err = client.Get(baseurl + "/lastupdate/" + hubUuid)
+	resp, err = client.Get(baseUrl + "/lastupdate/" + hubUuid)
 	if err != nil {
 		s5l.Printf("fwd: failed to query for lastupdate: %v\n", err)
 		return
@@ -66,9 +66,8 @@ func fwdGetLastUpdate(baseurl string, client *http.Client, hubUuid string) (last
 		return
 	}
 
-	dec := json.NewDecoder(resp.Body)
 	result := WebLastUpdateIdResponse{}
-	if err = dec.Decode(&result); err != nil {
+	if err = json.NewDecoder(resp.Body).Decode(&result); err != nil {
 		s5l.Printf("fwd: server failed to fulfill query for lastupdate: %v\n", err)
 		return
 	}
@@ -103,20 +102,19 @@ func fwdPostUpdates(client *http.Client, url string, pr *io.PipeReader) (int, er
 	if resp.StatusCode != http.StatusOK {
 		return 0, errors.New("")
 	}
-	dec := json.NewDecoder(resp.Body)
 	result := WebUpdatesPostResponse{}
-	if err = dec.Decode(&result); err != nil {
+	if err = json.NewDecoder(resp.Body).Decode(&result); err != nil {
 		return 0, err
 	}
 	return result.NumUpdates, nil
 }
 
-func (srv Server) forwardRun(baseurl string, client *http.Client) {
-	url := baseurl + "/updates/_bulk"
+func (srv Server) forwardRun(baseUrl string, client *http.Client) {
+	url := baseUrl + "/updates/_bulk"
 	hubUuid := srv.GetHubUuid()
 tryResync:
 	for {
-		lastId, err := fwdGetLastUpdate(baseurl, client, hubUuid)
+		lastId, err := fwdGetLastUpdateId(baseUrl, client, hubUuid)
 		if err != nil {
 			s5l.Printf("fwd: lastupdate returned err: %v", err)
 			time.Sleep(5 * time.Second)