Replace kind variable from validator API with Boolean stubout parameter.

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

Index: src/trusted/validator/x86/32/ncvalidate.c
diff --git a/src/trusted/validator/x86/32/ncvalidate.c b/src/trusted/validator/x86/32/ncvalidate.c
index 36d9a5063c4f0b567ad281cd6d86fe9059e76d88..4685938c61f5805bdb011498a9a35aab7c307703 100644
--- a/src/trusted/validator/x86/32/ncvalidate.c
+++ b/src/trusted/validator/x86/32/ncvalidate.c
@@ -90,11 +90,11 @@ NaClValidationStatus NCApplyValidatorStubout_x86_32(
 
 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) {
@@ -103,19 +103,13 @@ NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidator, NACL_TARGET_ARCH, 32) (
   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,

[Mark Seaborn, 2012/04/10 19:04:09]

Nit: indent -2

[Nick Bray (chromium), 2012/04/10 19:12:40]

Done.

             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;