Replace kind variable from validator API with Boolean stubout parameter.

src/trusted/service_runtime/sel_validate_image.c

Index: src/trusted/service_runtime/sel_validate_image.c
diff --git a/src/trusted/service_runtime/sel_validate_image.c b/src/trusted/service_runtime/sel_validate_image.c
index 02072b20d5965b127c859746ccbf372c473fdb08..8468ad9a7ef478ff978c8483d02378addef88fa9 100644
--- a/src/trusted/service_runtime/sel_validate_image.c
+++ b/src/trusted/service_runtime/sel_validate_image.c
@@ -71,9 +71,9 @@ int NaClValidateCode(struct NaClApp *nap, uintptr_t guest_addr,
                                NACL_TARGET_ARCH,
                                NACL_TARGET_SUBARCH)(
                                    sb_kind,
-                                   NaClApplyValidationDoStubout,
                                    guest_addr, data, size,
                                    nap->bundle_size,
+                                   TRUE, /* stub out */
                                    FALSE, /* text is not read-only */
                                    &nap->cpu_features,
                                    cache);
@@ -83,9 +83,10 @@ int NaClValidateCode(struct NaClApp *nap, uintptr_t guest_addr,
                                NACL_TARGET_ARCH,
                                NACL_TARGET_SUBARCH)(
                                    sb_kind,
-                                   NaClApplyCodeValidation,
                                    guest_addr, data, size,
                                    nap->bundle_size,
+                                   FALSE, /* do not stub out */
+                                   /* fixed feature cpu mode implies read-only*/

[Mark Seaborn, 2012/04/10 00:57:38]

Space before '*/'

I'd split this into a local var:
  /* ...implies read-only... */
  bool readonly_text = nap->fixed_feature_cpu_mode;

[Nick Bray (chromium), 2012/04/10 18:49:20]

Done.

                                    nap->fixed_feature_cpu_mode,
                                    &nap->cpu_features,
                                    cache);