From 786c3fafa0382a50b0c7c958f018838163979a27 Mon Sep 17 00:00:00 2001
From: John Howard <jhoward@microsoft.com>
Date: Thu, 30 Jul 2015 13:04:36 -0700
Subject: [PATCH] Tidy platform common bits in diff

Signed-off-by: John Howard <jhoward@microsoft.com>
---
 chrootarchive/diff.go         | 19 +++++++++++++++++++
 chrootarchive/diff_unix.go    | 19 +++----------------
 chrootarchive/diff_windows.go | 18 +-----------------
 3 files changed, 23 insertions(+), 33 deletions(-)
 create mode 100644 chrootarchive/diff.go

diff --git a/chrootarchive/diff.go b/chrootarchive/diff.go
new file mode 100644
index 0000000..75a176d
--- /dev/null
+++ b/chrootarchive/diff.go
@@ -0,0 +1,19 @@
+package chrootarchive
+
+import "github.com/docker/docker/pkg/archive"
+
+// ApplyLayer parses a diff in the standard layer format from `layer`,
+// and applies it to the directory `dest`. The stream `layer` can only be
+// uncompressed.
+// Returns the size in bytes of the contents of the layer.
+func ApplyLayer(dest string, layer archive.ArchiveReader) (size int64, err error) {
+	return applyLayerHandler(dest, layer, true)
+}
+
+// ApplyUncompressedLayer parses a diff in the standard layer format from
+// `layer`, and applies it to the directory `dest`. The stream `layer`
+// can only be uncompressed.
+// Returns the size in bytes of the contents of the layer.
+func ApplyUncompressedLayer(dest string, layer archive.ArchiveReader) (int64, error) {
+	return applyLayerHandler(dest, layer, false)
+}
diff --git a/chrootarchive/diff_unix.go b/chrootarchive/diff_unix.go
index bec85a0..86b62be 100644
--- a/chrootarchive/diff_unix.go
+++ b/chrootarchive/diff_unix.go
@@ -65,22 +65,9 @@ func applyLayer() {
 	os.Exit(0)
 }
 
-// ApplyLayer parses a diff in the standard layer format from `layer`,
-// and applies it to the directory `dest`. The stream `layer` can only be
-// uncompressed.
-// Returns the size in bytes of the contents of the layer.
-func ApplyLayer(dest string, layer archive.ArchiveReader) (size int64, err error) {
-	return applyLayerHandler(dest, layer, true)
-}
-
-// ApplyUncompressedLayer parses a diff in the standard layer format from
-// `layer`, and applies it to the directory `dest`. The stream `layer`
-// can only be uncompressed.
-// Returns the size in bytes of the contents of the layer.
-func ApplyUncompressedLayer(dest string, layer archive.ArchiveReader) (int64, error) {
-	return applyLayerHandler(dest, layer, false)
-}
-
+// applyLayerHandler parses a diff in the standard layer format from `layer`, and
+// applies it to the directory `dest`. Returns the size in bytes of the
+// contents of the layer.
 func applyLayerHandler(dest string, layer archive.ArchiveReader, decompress bool) (size int64, err error) {
 	dest = filepath.Clean(dest)
 	if decompress {
diff --git a/chrootarchive/diff_windows.go b/chrootarchive/diff_windows.go
index a1aacb7..5850de1 100644
--- a/chrootarchive/diff_windows.go
+++ b/chrootarchive/diff_windows.go
@@ -9,23 +9,7 @@ import (
 	"github.com/docker/docker/pkg/archive"
 )
 
-// ApplyLayer parses a diff in the standard layer format from `layer`,
-// and applies it to the directory `dest`. The stream `layer` can only be
-// uncompressed.
-// Returns the size in bytes of the contents of the layer.
-func ApplyLayer(dest string, layer archive.ArchiveReader) (size int64, err error) {
-	return applyLayerHandler(dest, layer, true)
-}
-
-// ApplyUncompressedLayer parses a diff in the standard layer format from
-// `layer`, and applies it to the directory `dest`. The stream `layer`
-// can only be uncompressed.
-// Returns the size in bytes of the contents of the layer.
-func ApplyUncompressedLayer(dest string, layer archive.ArchiveReader) (int64, error) {
-	return applyLayerHandler(dest, layer, false)
-}
-
-// ApplyLayer parses a diff in the standard layer format from `layer`, and
+// applyLayerHandler parses a diff in the standard layer format from `layer`, and
 // applies it to the directory `dest`. Returns the size in bytes of the
 // contents of the layer.
 func applyLayerHandler(dest string, layer archive.ArchiveReader, decompress bool) (size int64, err error) {