[Courgette] Make BSDiff search() use lexicographical_compare().

courgette/third_party/bsdiff/bsdiff_create.cc

 // 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
@@ skipping 30 matching lines @@
 //               --Stephen Adams <sra@chromium.org>
 // 2015-08-03 - Extract qsufsort portion to a separate file.
 //                --Samuel Huang <huangs@chromium.org>
 // 2015-08-12 - Interface change to search().
 //                --Samuel Huang <huangs@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.
 
-
 #include "courgette/third_party/bsdiff/bsdiff.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
 
 #include "courgette/crc.h"
 #include "courgette/streams.h"
+#include "courgette/third_party/bsdiff/bsdiff_search.h"
 #include "courgette/third_party/bsdiff/paged_array.h"
 #include "courgette/third_party/bsdiff/qsufsort.h"
 
 namespace courgette {
 
 static CheckBool WriteHeader(SinkStream* stream, MBSPatchHeader* header) {
   bool ok = stream->Write(header->tag, sizeof(header->tag));
   ok &= stream->WriteVarint32(header->slen);
   ok &= stream->WriteVarint32(header->scrc32);
   ok &= stream->WriteVarint32(header->dlen);
@@ skipping 92 matching lines @@
   int scan = 0;
   int match_length = 0;
 
   while (scan < newsize) {
     int pos = 0;
     int oldscore = 0;  // Count of how many bytes of the current match at |scan|
                        // extend the match at |lastscan|.
 
     scan += match_length;
     for (int scsc = scan; scan < newsize; ++scan) {
-      match_length = qsuf::search<PagedArray<int>&>(
+      match_length = courgette::search<PagedArray<int>&>(
           I, old, oldsize, newbuf + scan, newsize - scan, &pos);
 
       for (; scsc < scan + match_length; scsc++)
         if ((scsc + lastoffset < oldsize) &&
             (old[scsc + lastoffset] == newbuf[scsc]))
           oldscore++;
 
       if ((match_length == oldscore) && (match_length != 0))
         break;  // Good continuing match, case (1)
       if (match_length > oldscore + 8)
@@ skipping 145 matching lines @@
           << "  extra bytes: " << extra_bytes_length
           << "\nUncompressed bsdiff patch size "
           << patch_stream->Length() - initial_patch_stream_length
           << "\nEnd bsdiff "
           << (base::Time::Now() - start_bsdiff_time).InSecondsF();
 
   return OK;
 }
 
 }  // namespace courgette