From 6c407af390e7d5d4486ccf80b83f2ad457cd7559 Mon Sep 17 00:00:00 2001
From: Derek McGowan <derek@mcgstyle.net>
Date: Fri, 5 Jun 2015 15:32:31 -0700
Subject: [PATCH] Update graph walkhistory to pass by value

Remove unused graph history function

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: bb50a4159bda8e6f2d47b69ddd476ab32ac6be14
Component: engine
---
 components/engine/daemon/image_delete.go |  2 +-
 components/engine/graph/history.go       | 20 +++-----------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/components/engine/daemon/image_delete.go b/components/engine/daemon/image_delete.go
index 8056a87c86..d0e7e20d4b 100644
--- a/components/engine/daemon/image_delete.go
+++ b/components/engine/daemon/image_delete.go
@@ -160,7 +160,7 @@ func (daemon *Daemon) canDeleteImage(imgID string, force bool) error {
 			return err
 		}
 
-		if err := daemon.graph.WalkHistory(parent, func(p *image.Image) error {
+		if err := daemon.graph.WalkHistory(parent, func(p image.Image) error {
 			if imgID == p.ID {
 				if container.IsRunning() {
 					if force {
diff --git a/components/engine/graph/history.go b/components/engine/graph/history.go
index 280e7c8358..4bb93fc3f9 100644
--- a/components/engine/graph/history.go
+++ b/components/engine/graph/history.go
@@ -9,27 +9,13 @@ import (
 	"github.com/docker/docker/utils"
 )
 
-// History returns the list of all images used to create this image.
-func (graph *Graph) History(img *image.Image) ([]*image.Image, error) {
-	var parents []*image.Image
-	if err := graph.WalkHistory(img,
-		func(img *image.Image) error {
-			parents = append(parents, img)
-			return nil
-		},
-	); err != nil {
-		return nil, err
-	}
-	return parents, nil
-}
-
 // WalkHistory calls the handler function for each image in the
 // provided images lineage starting from immediate parent.
-func (graph *Graph) WalkHistory(img *image.Image, handler func(*image.Image) error) (err error) {
+func (graph *Graph) WalkHistory(img *image.Image, handler func(image.Image) error) (err error) {
 	currentImg := img
 	for currentImg != nil {
 		if handler != nil {
-			if err := handler(currentImg); err != nil {
+			if err := handler(*currentImg); err != nil {
 				return err
 			}
 		}
@@ -100,7 +86,7 @@ func (s *TagStore) History(name string) ([]*types.ImageHistory, error) {
 
 	history := []*types.ImageHistory{}
 
-	err = s.graph.WalkHistory(foundImage, func(img *image.Image) error {
+	err = s.graph.WalkHistory(foundImage, func(img image.Image) error {
 		history = append(history, &types.ImageHistory{
 			ID:        img.ID,
 			Created:   img.Created.Unix(),