[PATCH 3/8] apply: split load_preimage() helper function out

From

Junio C Hamano <gitster@pobox.com>

Date

May 10, 2012, 06:02 UTC

Message-ID

<1336629745-22436-4-git-send-email-gitster@pobox.com>

In-Reply-To

<1336629745-22436-1-git-send-email-gitster@pobox.com>

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 builtin/apply.c | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/builtin/apply.c b/builtin/apply.c
index cb6aad5..9f6f74f 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -3025,15 +3025,10 @@ static void prepare_fn_table(struct patch *patch)
 	}
 }
 
-static int try_threeway_fallback(struct image *image, struct patch *patch)
-{
-	return -1; /* for now */
-}
-
-static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *ce)
+static int load_preimage(struct image *image,
+			 struct patch *patch, struct stat *st, struct cache_entry *ce)
 {
 	struct strbuf buf = STRBUF_INIT;
-	struct image image;
 	size_t len;
 	char *img;
 	struct patch *tpatch;
@@ -3070,7 +3065,21 @@ static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *
 	}
 
 	img = strbuf_detach(&buf, &len);
-	prepare_image(&image, img, len, !patch->is_binary);
+	prepare_image(image, img, len, !patch->is_binary);
+	return 0;
+}
+
+static int try_threeway_fallback(struct image *image, struct patch *patch)
+{
+	return -1; /* for now */
+}
+
+static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *ce)
+{
+	struct image image;
+
+	if (load_preimage(&image, patch, st, ce) < 0)
+		return -1;
 
 	if (apply_fragments(&image, patch) < 0) {
 		/* Note: with --reject, the above call succeeds. */

-- 
1.7.10.1.562.gfc79b1c