Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(340)

Unified Diff: courgette/third_party/bsdiff/bsdiff.h

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: courgette/third_party/bsdiff/bsdiff.h
diff --git a/courgette/third_party/bsdiff/bsdiff.h b/courgette/third_party/bsdiff/bsdiff.h
index 707d0814d25b8eb7859b00ea656db26f3b7b8230..72e6b7469d0908fd2b2c855795caf030bbaee265 100644
--- a/courgette/third_party/bsdiff/bsdiff.h
+++ b/courgette/third_party/bsdiff/bsdiff.h
@@ -1,38 +1,31 @@
-/*-
- * Copyright 2003,2004 Colin Percival
- * All rights reserved
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted providing that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * Changelog:
- * 2005-04-26 - Define the header as a C structure, add a CRC32 checksum to
- * the header, and make all the types 32-bit.
- * --Benjamin Smedberg <benjamin@smedbergs.us>
- * 2009-03-31 - Change to use Streams. Move CRC code to crc.{h,cc}
- * Changed status to an enum, removed unused status codes.
- * --Stephen Adams <sra@chromium.org>
- * 2013-04-10 - Added wrapper to apply a patch directly to files.
- * --Joshua Pawlicki <waffles@chromium.org>
- */
+// Copyright 2003, 2004 Colin Percival
+// All rights reserved
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted providing that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+// For the terms under which this work may be distributed, please see
+// the adjoining file "LICENSE".
+//
+// Changelog:
+// 2005-04-26 - Define the header as a C structure, add a CRC32 checksum to
+// the header, and make all the types 32-bit.
+// --Benjamin Smedberg <benjamin@smedbergs.us>
+// 2009-03-31 - Change to use Streams. Move CRC code to crc.{h,cc}
+// Changed status to an enum, removed unused status codes.
+// --Stephen Adams <sra@chromium.org>
+// 2013-04-10 - Added wrapper to apply a patch directly to files.
+// --Joshua Pawlicki <waffles@chromium.org>
+
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
#ifndef COURGETTE_THIRD_PARTY_BSDIFF_BSDIFF_H_
#define COURGETTE_THIRD_PARTY_BSDIFF_BSDIFF_H_
@@ -42,6 +35,11 @@
#include "base/files/file_util.h"
namespace courgette {
+class SourceStream;
+class SinkStream;
+} // namespace courgette
+
+namespace bsdiff {
enum BSDiffStatus {
OK = 0,
@@ -52,22 +50,19 @@ enum BSDiffStatus {
WRITE_ERROR = 5
};
-class SourceStream;
-class SinkStream;
-
// Creates a binary patch.
//
-BSDiffStatus CreateBinaryPatch(SourceStream* old_stream,
- SourceStream* new_stream,
- SinkStream* patch_stream);
+BSDiffStatus CreateBinaryPatch(courgette::SourceStream* old_stream,
+ courgette::SourceStream* new_stream,
+ courgette::SinkStream* patch_stream);
// Applies the given patch file to a given source file. This method validates
// the CRC of the original file stored in the patch file, before applying the
// patch to it.
//
-BSDiffStatus ApplyBinaryPatch(SourceStream* old_stream,
- SourceStream* patch_stream,
- SinkStream* new_stream);
+BSDiffStatus ApplyBinaryPatch(courgette::SourceStream* old_stream,
+ courgette::SourceStream* patch_stream,
+ courgette::SinkStream* new_stream);
// As above, but simply takes the file paths.
BSDiffStatus ApplyBinaryPatch(const base::FilePath& old_stream,
@@ -89,5 +84,6 @@ typedef struct MBSPatchHeader_ {
// null at end of string.
#define MBS_PATCH_HEADER_TAG "GBSDIF42"
-} // namespace
+} // namespace bsdiff
+
#endif // COURGETTE_THIRD_PARTY_BSDIFF_BSDIFF_H_

Powered by Google App Engine
This is Rietveld 408576698