chrome/installer/setup/setup_util.cc - Issue 2031193002: [Courgette] Refactor BSDiff namespaces and bsdiff::search() interface.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/installer/setup/setup_util.cc

Issue 2031193002: [Courgette] Refactor BSDiff namespaces and bsdiff::search() interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Make license style uniform; remove checklicenses.py entries. Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/installer/setup/setup_util.cc

diff --git a/chrome/installer/setup/setup_util.cc b/chrome/installer/setup/setup_util.cc

index 75cc8a61e01e8a33c2e164aeb3b3aec81f3a3b1d..f55c8629afd660a1ef5e0172d5fe5a880c1595b6 100644

--- a/chrome/installer/setup/setup_util.cc

+++ b/chrome/installer/setup/setup_util.cc

@@ -37,7 +37,6 @@

#include "chrome/installer/util/util_constants.h"

#include "courgette/courgette.h"

#include "courgette/third_party/bsdiff/bsdiff.h"

-#include "third_party/bspatch/mbspatch.h"

namespace installer {

@@ -87,8 +86,8 @@ int BsdiffPatchFiles(const base::FilePath& src,

if (src.empty() || patch.empty() || dest.empty())

return installer::PATCH_INVALID_ARGUMENTS;

- const int patch_status = courgette::ApplyBinaryPatch(src, patch, dest);

- const int exit_code = patch_status != OK ?

+ const int patch_status = bsdiff::ApplyBinaryPatch(src, patch, dest);

+ const int exit_code = patch_status != bsdiff::OK ?

patch_status + kBsdiffErrorOffset : 0;

LOG_IF(ERROR, exit_code)

« no previous file with comments | « no previous file | chrome/utility/chrome_content_utility_client.cc » ('j') | courgette/third_party/bsdiff/bsdiff_search.h » ('J')