Incorporate shimming into the irt

src/untrusted/irt/irt_interfaces.c

Index: src/untrusted/irt/irt_interfaces.c
===================================================================
--- src/untrusted/irt/irt_interfaces.c	(revision 9574)
+++ src/untrusted/irt/irt_interfaces.c	(working copy)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 The Native Client Authors. All rights reserved.
+ * Copyright 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.
  */
@@ -30,8 +30,11 @@
   { NACL_IRT_BLOCKHOOK_v0_1, &nacl_irt_blockhook, sizeof(nacl_irt_blockhook) },
   { NACL_IRT_RESOURCE_OPEN_v0_1, &nacl_irt_resource_open,
       sizeof(nacl_irt_resource_open) },
+/* @IGNORE_LINES_FOR_CODE_HYGIENE[1] */
 #ifdef IRT_PPAPI
   { NACL_IRT_PPAPIHOOK_v0_1, &nacl_irt_ppapihook, sizeof(nacl_irt_ppapihook) },
+  { NACL_IRT_PPAPIHOOK_SHIMMED_v0_1, &nacl_irt_ppapihook_shimmed,

[Nick Bray (chromium), 2012/08/27 23:00:02]

This should should be guarded by a temporary #define (NACL_IRT_PPAPI_SHIMS or
somesuch).

[Robert Muth (chromium), 2012/08/28 14:18:01]

Done.

[Mark Seaborn, 2012/08/28 15:51:20]

@Nick/Brad: why did you say this?

[Robert Muth (chromium), 2012/08/28 18:13:29]

we will likely get link errors on the chrome side until
the shimming  magic has landed there

On 2012/08/28 15:51:20, Mark Seaborn wrote:

+    sizeof(nacl_irt_ppapihook) },
 #endif
   { NACL_IRT_RANDOM_v0_1, &nacl_irt_random, sizeof(nacl_irt_random) },
   { NACL_IRT_CLOCK_v0_1, &nacl_irt_clock, sizeof(nacl_irt_clock) },
@@ -40,9 +43,9 @@
 };
 
 size_t nacl_irt_interface(const char *interface_ident,
-                          void *table, size_t tablesize) {
-  int i;
-  for (i = 0; i < NACL_ARRAY_SIZE(irt_interfaces); ++i) {
+                          void *table,
+                          size_t tablesize) {
+  for (int i = 0; i < NACL_ARRAY_SIZE(irt_interfaces); ++i) {
     if (0 == strcmp(interface_ident, irt_interfaces[i].name)) {
       const size_t size = irt_interfaces[i].size;
       if (size <= tablesize) {