From f35146e48edca6755e98749a2cb5cc00272d308b Mon Sep 17 00:00:00 2001 From: Samuel Huang Date: Thu, 21 Jun 2018 15:50:22 +0000 Subject: [Zucchini] Refactor Zucchini-gen in zucchini_io layer. This CL moves Zucchini-gen invocation code from zucchini_commands.cc (in target zucchini) to zucchini_integration.cc (in target zucchini_io) to clean up layering in Zucchini API, i.e.: - zucchini_lib: Operates on buffers only. - zucchini_io: Adds files interface, uses memory-mapped I/O. - zucchini: Stand-alone executable that parses command-line arguments. Other changes: - Rename zucchini_lib functions (zuchcini.h), to dedup names and emphasize that these functions operate on buffers: - GenerateEnsemble() -> GenerateBuffer(), - GenerateEnsembleWithImposedMatches() -> GenerateBufferImposed(), - GenerateRaw() -> GenerateBufferRaw(), - Apply() -> ApplyBuffer(). These renames only affect Zucchini and various tests. - Variable renames and parameter reordering in zucchini_integration.cc. - Remove '-dd' param in help text of Zucchini-detect (was never ported from Trunk, and has been recently deleted there as well). - Replace all base::File&& with base::File. - Miscellaneous cleanup for header include. - Update README.md. Change-Id: I835b80d4d3d7b291fa822a7a89dab225bf9171e9 Reviewed-on: https://chromium-review.googlesource.com/1105625 Reviewed-by: Samuel Huang Reviewed-by: Greg Thompson Commit-Queue: Samuel Huang Cr-Commit-Position: refs/heads/master@{#569274} NOKEYCHECK=True GitOrigin-RevId: 9f0f325d6e2595deb8d50c77e0464946f3bf1ec1 --- zucchini_apply.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'zucchini_apply.cc') diff --git a/zucchini_apply.cc b/zucchini_apply.cc index af4eab9..f6226bc 100644 --- a/zucchini_apply.cc +++ b/zucchini_apply.cc @@ -188,9 +188,9 @@ bool ApplyElement(ExecutableType exe_type, /******** Exported Functions ********/ -status::Code Apply(ConstBufferView old_image, - const EnsemblePatchReader& patch_reader, - MutableBufferView new_image) { +status::Code ApplyBuffer(ConstBufferView old_image, + const EnsemblePatchReader& patch_reader, + MutableBufferView new_image) { if (!patch_reader.CheckOldFile(old_image)) { LOG(ERROR) << "Invalid old_image."; return status::kStatusInvalidOldImage; -- cgit v1.2.3