Eliminate bundle_size parameter from validator interface.

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

Index: src/trusted/validator/x86/64/ncvalidate.c
diff --git a/src/trusted/validator/x86/64/ncvalidate.c b/src/trusted/validator/x86/64/ncvalidate.c
index 9af4649454a6743b77a618cfa768a73179d95198..b63c09ee31a7153e878622713e9883157b931156 100644
--- a/src/trusted/validator/x86/64/ncvalidate.c
+++ b/src/trusted/validator/x86/64/ncvalidate.c
@@ -23,11 +23,10 @@
 NaClValidationStatus NaClValidatorSetup_x86_64(
     intptr_t guest_addr,
     size_t size,
-    int bundle_size,
     int readonly_text,
     const NaClCPUFeaturesX86 *cpu_features,
     struct NaClValidatorState** vstate_ptr) {
-  *vstate_ptr = NaClValidatorStateCreate(guest_addr, size, bundle_size, RegR15,
+  *vstate_ptr = NaClValidatorStateCreate(guest_addr, size, RegR15,
                                          readonly_text, cpu_features);
   return (*vstate_ptr == NULL)
       ? NaClValidationFailedOutOfMemory
@@ -39,7 +38,6 @@ NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidator, x86, 64) (
     uintptr_t guest_addr,
     uint8_t *data,
     size_t size,
-    int bundle_size,
     int stubout_mode,
     int readonly_text,
     const NaClCPUFeaturesX86 *cpu_features,
@@ -52,9 +50,6 @@ NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidator, x86, 64) (
   if (sb_kind != NACL_SB_DEFAULT)
     return NaClValidationFailedNotImplemented;
 
-  if (bundle_size != 16 && bundle_size != 32)
-    return NaClValidationFailedNotImplemented;
-
   if (stubout_mode && readonly_text)
     return NaClValidationFailedNotImplemented;
 
@@ -81,7 +76,7 @@ NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidator, x86, 64) (
 
   /* Init then validator state. */
   status = NaClValidatorSetup_x86_64(
-      guest_addr, size, bundle_size, readonly_text, cpu_features, &vstate);
+      guest_addr, size, readonly_text, cpu_features, &vstate);
   if (status != NaClValidationSucceeded) {
     if (query != NULL)
       cache->DestroyQuery(query);
@@ -113,7 +108,6 @@ NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidatorCodeReplacement, x86, 64)
      uint8_t *data_old,
      uint8_t *data_new,
      size_t size,
-     int bundle_size,
      const NaClCPUFeaturesX86 *cpu_features) {
   NaClValidationStatus status;
   struct NaClValidatorState *vstate;
@@ -122,14 +116,11 @@ NaClValidationStatus NACL_SUBARCH_NAME(ApplyValidatorCodeReplacement, x86, 64)
   if (sb_kind != NACL_SB_DEFAULT)
     return NaClValidationFailedNotImplemented;
 
-  if (bundle_size != 16 && bundle_size != 32)
-    return NaClValidationFailedNotImplemented;
-
   if (!NaClArchSupported(cpu_features))
     return NaClValidationFailedCpuNotSupported;
 
   /* Init then validator state. */
-  status = NaClValidatorSetup_x86_64(guest_addr, size, bundle_size, FALSE,
+  status = NaClValidatorSetup_x86_64(guest_addr, size, FALSE,
                                      cpu_features, &vstate);
   if (status != NaClValidationSucceeded) return status;
   NaClValidatorStateSetLogVerbosity(vstate, LOG_ERROR);