Replace kind variable from validator API with Boolean stubout parameter.

src/trusted/validator/x86/64/ncvalidate.c

 /*
  * Copyright (c) 2012 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /* Implement the ApplyValidator API for the x86-64 architecture. */
 #include <assert.h>
 #include "native_client/src/shared/platform/nacl_log.h"
 #include "native_client/src/trusted/validator/ncvalidate.h"
@@ skipping 85 matching lines @@
                                 cpu_features, &vstate);
   if (status != NaClValidationSucceeded) return status;
   NaClValidatorStateSetDoStubOut(vstate, TRUE);
   NaClValidateSegment(data, guest_addr, size, vstate);
   NaClValidatorStateDestroy(vstate);
   return NaClValidationSucceeded;
 }
 
 NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidator, x86, 64) (
     enum NaClSBKind sb_kind,
-    NaClApplyValidationKind kind,
     uintptr_t guest_addr,
     uint8_t *data,
     size_t size,
     int bundle_size,
+    int stubout_mode,
     int readonly_text,
     const NaClCPUFeaturesX86 *cpu_features,
     struct NaClValidationCache *cache) {
   NaClValidationStatus status = NaClValidationFailedNotImplemented;
   assert(NACL_SB_DEFAULT == sb_kind);
   if (bundle_size == 16 || bundle_size == 32) {
     if (!NaClArchSupported(cpu_features))
       return NaClValidationFailedCpuNotSupported;
-    switch (kind) {
-      case NaClApplyCodeValidation:
-        status = NaClApplyValidatorSilently_x86_64(
-            guest_addr, data, size, bundle_size,
-            readonly_text, cpu_features, cache);
-        break;
-      case NaClApplyValidationDoStubout:
-        status = NaClApplyValidatorStubout_x86_64(
-            guest_addr, data, size, bundle_size, cpu_features);
-        break;
-      default:
-        break;
+    if (stubout_mode) {
+      status = NaClApplyValidatorStubout_x86_64(
+          guest_addr, data, size, bundle_size, cpu_features);
+    } else {
+      status = NaClApplyValidatorSilently_x86_64(
+          guest_addr, data, size, bundle_size,
+          readonly_text, cpu_features, cache);
     }
   }
   return status;
 }
 
 static NaClValidationStatus NaClApplyValidatorPair(
     uintptr_t guest_addr,
     uint8_t *data_old,
     uint8_t *data_new,
     size_t size,
@@ skipping 25 matching lines @@
   if (bundle_size == 16 || bundle_size == 32) {
     if (!NaClArchSupported(cpu_features)) {
       status = NaClValidationFailedCpuNotSupported;
     } else {
       status = NaClApplyValidatorPair(guest_addr, data_old, data_new,
                                       size, bundle_size, cpu_features);
     }
   }
   return status;
 }