[Courgette] Refactor BSDiff namespaces and bsdiff::search() interface.

courgette/simple_delta.cc

Index: courgette/simple_delta.cc
diff --git a/courgette/simple_delta.cc b/courgette/simple_delta.cc
index ed7eaa0ebcedddeb31daab150e59fb49f48a7243..d6f2cb459d5510bdc52585ad4592728af153d496 100644
--- a/courgette/simple_delta.cc
+++ b/courgette/simple_delta.cc
@@ -15,10 +15,10 @@ namespace courgette {
 
 namespace {
 
-Status BSDiffStatusToStatus(BSDiffStatus status) {
+Status BSDiffStatusToStatus(bsdiff::BSDiffStatus status) {
   switch (status) {
-    case OK: return C_OK;
-    case CRC_ERROR: return C_BINARY_DIFF_CRC_ERROR;
+    case bsdiff::OK: return C_OK;
+    case bsdiff::CRC_ERROR: return C_BINARY_DIFF_CRC_ERROR;
     default: return C_GENERAL_ERROR;
   }
 }
@@ -27,14 +27,14 @@ Status BSDiffStatusToStatus(BSDiffStatus status) {
 
 Status ApplySimpleDelta(SourceStream* old, SourceStream* delta,
                         SinkStream* target) {
-  return BSDiffStatusToStatus(ApplyBinaryPatch(old, delta, target));
+  return BSDiffStatusToStatus(bsdiff::ApplyBinaryPatch(old, delta, target));
 }
 
 Status GenerateSimpleDelta(SourceStream* old, SourceStream* target,
                            SinkStream* delta) {
   VLOG(1) << "GenerateSimpleDelta " << old->Remaining()
           << " " << target->Remaining();
-  return BSDiffStatusToStatus(CreateBinaryPatch(old, target, delta));
+  return BSDiffStatusToStatus(bsdiff::CreateBinaryPatch(old, target, delta));
 }
 
 }  // namespace courgette