From: Andrew Gerrand <adg@golang.org>
Date: Wed, 21 Dec 2011 10:12:03 +0000 (+1100)
Subject: dashboard: use 'ok' instead of 'hit' or 'miss' for bool return vals
X-Git-Tag: weekly.2011-12-22~64
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=351f7efec489d89dab70d876ef35e1aa75e42b78;p=gostls13.git

dashboard: use 'ok' instead of 'hit' or 'miss' for bool return vals

R=dsymonds, rsc
CC=golang-dev
https://golang.org/cl/5505054
---

diff --git a/misc/dashboard/app/build/cache.go b/misc/dashboard/app/build/cache.go
index 34d39ac92c..799a9c11ae 100644
--- a/misc/dashboard/app/build/cache.go
+++ b/misc/dashboard/app/build/cache.go
@@ -32,8 +32,8 @@ func invalidateCache(c appengine.Context) {
 
 // cachedTodo gets the specified todo cache entry (if it exists) from the
 // shared todo cache.
-func cachedTodo(c appengine.Context, todoKey string) (todo *Todo, hit bool) {
-	t, _ := todoCache(c)
+func cachedTodo(c appengine.Context, todoKey string) (todo *Todo, ok bool) {
+	t := todoCache(c)
 	if t == nil {
 		return nil, false
 	}
@@ -41,7 +41,7 @@ func cachedTodo(c appengine.Context, todoKey string) (todo *Todo, hit bool) {
 	if todos == nil {
 		return nil, false
 	}
-	todo, hit = todos[todoKey]
+	todo, ok = todos[todoKey]
 	return
 }
 
@@ -50,17 +50,14 @@ func cachedTodo(c appengine.Context, todoKey string) (todo *Todo, hit bool) {
 func cacheTodo(c appengine.Context, todoKey string, todo *Todo) {
 	// Get the todo cache record (or create a new one).
 	newItem := false
-	t, miss := todoCache(c)
-	if miss {
+	t := todoCache(c)
+	if t == nil {
 		newItem = true
 		t = &memcache.Item{
 			Key:   todoCacheKey,
 			Value: []byte("{}"), // default is an empty JSON object
 		}
 	}
-	if t == nil {
-		return
-	}
 
 	// Unmarshal the JSON value.
 	todos := unmarshalTodo(c, t)
@@ -98,15 +95,15 @@ func cacheTodo(c appengine.Context, todoKey string, todo *Todo) {
 }
 
 // todoCache gets the todo cache record from memcache (if it exists).
-func todoCache(c appengine.Context) (item *memcache.Item, miss bool) {
+func todoCache(c appengine.Context) *memcache.Item {
 	t, err := memcache.Get(c, todoCacheKey)
-	if err == memcache.ErrCacheMiss {
-		return nil, true
-	} else if err != nil {
-		c.Errorf("get todo cache: %v", err)
-		return nil, false
+	if err != nil {
+		if err != memcache.ErrCacheMiss {
+			c.Errorf("get todo cache: %v", err)
+		}
+		return nil
 	}
-	return t, false
+	return t
 }
 
 // unmarshalTodo decodes the given item's memcache value into a map.
diff --git a/misc/dashboard/app/build/handler.go b/misc/dashboard/app/build/handler.go
index 28a3889d48..a4d52853ae 100644
--- a/misc/dashboard/app/build/handler.go
+++ b/misc/dashboard/app/build/handler.go
@@ -150,7 +150,7 @@ func todoHandler(r *http.Request) (interface{}, os.Error) {
 	c := appengine.NewContext(r)
 
 	todoKey := r.Form.Encode()
-	if t, hit := cachedTodo(c, todoKey); hit {
+	if t, ok := cachedTodo(c, todoKey); ok {
 		c.Debugf("cache hit")
 		return t, nil
 	}