Eliminate bundle_size parameter from validator interface.

src/trusted/validator/x86/32/ncvalidate_verbose.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 ApplyValidatorVerbosely API for the x86-32 architecture. */
 
 #include "native_client/src/trusted/validator/ncvalidate.h"
 
@@ skipping 10 matching lines @@
 #else
 # if NACL_TARGET_SUBARCH != 32
 #  error("Can't compile, target is for x86-32")
 # endif
 #endif
 
 static NaClValidationStatus NCApplyValidatorVerbosely_x86_32(
     uintptr_t guest_addr,
     uint8_t *data,
     size_t size,
-    int bundle_size,
     const NaClCPUFeaturesX86 *cpu_features) {
   int validator_result = 0;
   struct NCValidatorState *vstate;
 
-  vstate = NCValidateInitDetailed(guest_addr, size, bundle_size, cpu_features);
+  vstate = NCValidateInitDetailed(guest_addr, size, cpu_features);
   if (vstate == NULL) return NaClValidationFailedOutOfMemory;
   NCValidateSetNumDiagnostics(vstate, -1);  /* Reports all errors. */
   NCValidateSetErrorReporter(vstate, &kNCVerboseErrorReporter);
   NCValidateSegment(data, guest_addr, size, vstate);
   validator_result = NCValidateFinish(vstate);
   NCValidateFreeState(&vstate);
   return (validator_result == 0)
       ? NaClValidationSucceeded : NaClValidationFailed;
 }
 
 NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidatorVerbosely, x86, 32)
     (enum NaClSBKind sb_kind,
      uintptr_t guest_addr,
      uint8_t *data,
      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))
-      return NaClValidationFailedCpuNotSupported;
-    status = NCApplyValidatorVerbosely_x86_32(
-        guest_addr, data, size, bundle_size, cpu_features);
-  }
-  return status;
+
+  if (!NaClArchSupported(cpu_features))
+    return NaClValidationFailedCpuNotSupported;
+
+  return NCApplyValidatorVerbosely_x86_32(
+      guest_addr, data, size, cpu_features);
 }