Update OTS to revision 6d2e08b

third_party/ots/test/ot-sanitise.cc

 // Copyright (c) 2009 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.
 
 // A very simple driver program while sanitises the file given as argv[1] and
 // writes the sanitised version to stdout.
 
 #include <fcntl.h>
 #include <sys/stat.h>
 #if defined(_WIN32)
@@ skipping 31 matching lines @@
       std::fprintf(stderr, "ERROR: ");
     else
       std::fprintf(stderr, "WARNING: ");
     va_start(va, format);
     std::vfprintf(stderr, format, va);
     std::fprintf(stderr, "\n");
     va_end(va);
   }
 
   virtual ots::TableAction GetTableAction(uint32_t tag) {
-#define TAG(a, b, c, d) ((a) << 24 | (b) << 16 | (c) << 8 | (d))
     switch (tag) {
-      case TAG('S','i','l','f'):
-      case TAG('S','i','l','l'):
-      case TAG('G','l','o','c'):
-      case TAG('G','l','a','t'):
-      case TAG('F','e','a','t'):
+      case OTS_TAG('S','i','l','f'):
+      case OTS_TAG('S','i','l','l'):
+      case OTS_TAG('G','l','o','c'):
+      case OTS_TAG('G','l','a','t'):
+      case OTS_TAG('F','e','a','t'):
+      case OTS_TAG('C','B','D','T'):
+      case OTS_TAG('C','B','L','C'):
         return ots::TABLE_ACTION_PASSTHRU;
       default:
         return ots::TABLE_ACTION_DEFAULT;
     }
-#undef TAG
   }
 };
 
 }  // namespace
 
 int main(int argc, char **argv) {
   if (argc < 2 || argc > 3) return Usage(argv[0]);
 
   const int fd = ::open(argv[1], O_RDONLY | ADDITIONAL_OPEN_FLAGS);
   if (fd < 0) {
@@ skipping 18 matching lines @@
     out = fopen(argv[2], "wb");
 
   ots::FILEStream output(out);
   const bool result = context.Process(&output, data, st.st_size);
 
   if (!result) {
     std::fprintf(stderr, "Failed to sanitise file!\n");
   }
   return !result;
 }