Replace kind variable from validator API with Boolean stubout parameter.

src/trusted/validator/x86/32/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-32 architecture. */
 
 #include "native_client/src/trusted/validator/ncvalidate.h"
 #include "native_client/src/trusted/validator/validation_cache.h"
@@ skipping 72 matching lines @@
   if (vstate == NULL) return NaClValidationFailedOutOfMemory;
   NCValidateSetStubOutMode(vstate, 1);
   NCValidateSegment(data, guest_addr, size, vstate);
   NCValidateFinish(vstate);
   NCValidateFreeState(&vstate);
   return NaClValidationSucceeded;
 }
 
 NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidator, NACL_TARGET_ARCH, 32) (
     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 = NCApplyValidatorSilently_x86_32(
+    if (stubout_mode) {
+      status = NCApplyValidatorStubout_x86_32(
+          guest_addr, data, size, bundle_size, cpu_features);
+    } else {
+      status = NCApplyValidatorSilently_x86_32(
             guest_addr, data, size, bundle_size,
             readonly_text, cpu_features, cache);
-        break;
-      case NaClApplyValidationDoStubout:
-        status = NCApplyValidatorStubout_x86_32(
-            guest_addr, data, size, bundle_size, cpu_features);
-        break;
-      default:
-        /* If reached, it isn't implemented (yet). */
-        break;
     }
   }
   return status;
 }
 
 NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidatorCodeReplacement, x86, 32)
     (enum NaClSBKind sb_kind,
      uintptr_t guest_addr,
      uint8_t *data_old,
      uint8_t *data_new,
      size_t size,
      int bundle_size,
      const NaClCPUFeaturesX86 *cpu_features) {
   NaClValidationStatus status = NaClValidationFailedNotImplemented;
   assert(NACL_SB_DEFAULT == sb_kind);
   if (bundle_size == 16 || bundle_size == 32) {
     if (!NaClArchSupported(cpu_features)) {
       status = NaClValidationFailedCpuNotSupported;
     } else {
       status = NCValidateSegmentPair(data_old, data_new, guest_addr,
                                      size, bundle_size, cpu_features)
         ? NaClValidationSucceeded : NaClValidationFailed;
     }
   }
   return status;
 }