Make some of the pnacl_irt_shim data members local.

Make some of the pnacl_irt_shim data members local.

The structs are internal to the pnacl_shim.c.

BUG=none
R=teravest@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=243452

[teravest, 2014-01-07 19:46:22]

lgtm

[commit-bot: I haz the power, 2014-01-07 21:55:17]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jvoung@chromium.org/126343002/180001

[commit-bot: I haz the power, 2014-01-08 00:46:37]

Failed to apply patch for
ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
  Hunk #1 FAILED at 1.
  Hunk #2 succeeded at 4028 (offset -3 lines).
  Hunk #3 succeeded at 4042 (offset -3 lines).
  Hunk #4 succeeded at 4055 (offset -3 lines).
  Hunk #5 succeeded at 4069 (offset -3 lines).
  Hunk #6 succeeded at 4082 (offset -3 lines).
  Hunk #7 succeeded at 4097 (offset -3 lines).
  Hunk #8 succeeded at 4108 (offset -3 lines).
  Hunk #9 succeeded at 4118 (offset -3 lines).
  Hunk #10 succeeded at 4130 (offset -3 lines).
  Hunk #11 succeeded at 4141 (offset -3 lines).
  Hunk #12 succeeded at 4154 (offset -3 lines).
  Hunk #13 succeeded at 4162 (offset -3 lines).
  Hunk #14 succeeded at 4171 (offset -3 lines).
  Hunk #15 succeeded at 4179 (offset -3 lines).
  Hunk #16 succeeded at 4195 (offset -3 lines).
  Hunk #17 succeeded at 4207 (offset -3 lines).
  Hunk #18 succeeded at 4217 (offset -3 lines).
  Hunk #19 succeeded at 4227 (offset -3 lines).
  Hunk #20 succeeded at 4248 (offset -3 lines).
  Hunk #21 succeeded at 4259 (offset -3 lines).
  Hunk #22 succeeded at 4281 (offset -3 lines).
  Hunk #23 succeeded at 4296 (offset -3 lines).
  Hunk #24 succeeded at 4314 (offset -3 lines).
  Hunk #25 succeeded at 4327 (offset -3 lines).
  Hunk #26 succeeded at 4335 (offset -3 lines).
  Hunk #27 succeeded at 4363 (offset -3 lines).
  Hunk #28 succeeded at 4385 (offset -3 lines).
  Hunk #29 succeeded at 4410 (offset -3 lines).
  Hunk #30 succeeded at 4430 (offset -3 lines).
  Hunk #31 succeeded at 4439 (offset -3 lines).
  Hunk #32 succeeded at 4451 (offset -3 lines).
  Hunk #33 succeeded at 4469 (offset -3 lines).
  Hunk #34 succeeded at 4496 (offset -3 lines).
  Hunk #35 succeeded at 4511 (offset -3 lines).
  Hunk #36 succeeded at 4520 (offset -3 lines).
  Hunk #37 succeeded at 4530 (offset -3 lines).
  Hunk #38 succeeded at 4538 (offset -3 lines).
  Hunk #39 succeeded at 4553 (offset -5 lines).
  Hunk #40 succeeded at 4563 (offset -5 lines).
  Hunk #41 succeeded at 4574 (offset -5 lines).
  Hunk #42 succeeded at 4586 (offset -5 lines).
  Hunk #43 succeeded at 4603 (offset -5 lines).
  Hunk #44 succeeded at 4630 (offset -5 lines).
  Hunk #45 succeeded at 4644 (offset -5 lines).
  Hunk #46 succeeded at 4658 (offset -5 lines).
  Hunk #47 succeeded at 4688 (offset -5 lines).
  Hunk #48 succeeded at 4707 (offset -5 lines).
  Hunk #49 succeeded at 4727 (offset -5 lines).
  Hunk #50 succeeded at 4742 (offset -5 lines).
  Hunk #51 succeeded at 4781 (offset -5 lines).
  Hunk #52 succeeded at 4791 (offset -5 lines).
  Hunk #53 succeeded at 4800 (offset -5 lines).
  Hunk #54 succeeded at 4826 (offset -5 lines).
  Hunk #55 succeeded at 4834 (offset -5 lines).
  Hunk #56 succeeded at 4845 (offset -5 lines).
  Hunk #57 succeeded at 4859 (offset -5 lines).
  Hunk #58 succeeded at 4892 (offset -5 lines).
  Hunk #59 succeeded at 4901 (offset -5 lines).
  Hunk #60 succeeded at 4914 (offset -5 lines).
  Hunk #61 succeeded at 4929 (offset -5 lines).
  Hunk #62 succeeded at 4945 (offset -5 lines).
  Hunk #63 succeeded at 4957 (offset -5 lines).
  Hunk #64 succeeded at 4967 (offset -5 lines).
  Hunk #65 succeeded at 4978 (offset -5 lines).
  Hunk #66 succeeded at 4990 (offset -5 lines).
  Hunk #67 succeeded at 5004 (offset -5 lines).
  Hunk #68 succeeded at 5012 (offset -5 lines).
  Hunk #69 succeeded at 5038 (offset -5 lines).
  Hunk #70 succeeded at 5060 (offset -5 lines).
  1 out of 70 hunks FAILED -- saving rejects to file
ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c.rej

Patch:       ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
Index: ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
index
c83a1f6d5b812bcea6ae2c088ec575d67e31f93b..1ddc4ef60208433d9c934dfd3c1bdf33727362b4
100644
--- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
+++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013 The Chromium Authors. All rights reserved.
+/* Copyright (c) 2014 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -4031,12 +4031,12 @@ static int32_t
Pnacl_M29_PPB_Ext_Socket_Dev_GetJoinedGroups(PP_Instance instance
 
 /* Not generating wrapper interface for PPB_AudioConfig_1_1 */
 
-struct PPB_Console_1_0 Pnacl_Wrappers_PPB_Console_1_0 = {
+static struct PPB_Console_1_0 Pnacl_Wrappers_PPB_Console_1_0 = {
     .Log = (void (*)(PP_Instance instance, PP_LogLevel level, struct PP_Var
value))&Pnacl_M25_PPB_Console_Log,
     .LogWithSource = (void (*)(PP_Instance instance, PP_LogLevel level, struct
PP_Var source, struct PP_Var value))&Pnacl_M25_PPB_Console_LogWithSource
 };
 
-struct PPB_Core_1_0 Pnacl_Wrappers_PPB_Core_1_0 = {
+static struct PPB_Core_1_0 Pnacl_Wrappers_PPB_Core_1_0 = {
     .AddRefResource = (void (*)(PP_Resource
resource))&Pnacl_M14_PPB_Core_AddRefResource,
     .ReleaseResource = (void (*)(PP_Resource
resource))&Pnacl_M14_PPB_Core_ReleaseResource,
     .GetTime = (PP_Time (*)(void))&Pnacl_M14_PPB_Core_GetTime,
@@ -4045,7 +4045,7 @@ struct PPB_Core_1_0 Pnacl_Wrappers_PPB_Core_1_0 = {
     .IsMainThread = (PP_Bool (*)(void))&Pnacl_M14_PPB_Core_IsMainThread
 };
 
-struct PPB_FileIO_1_0 Pnacl_Wrappers_PPB_FileIO_1_0 = {
+static struct PPB_FileIO_1_0 Pnacl_Wrappers_PPB_FileIO_1_0 = {
     .Create = (PP_Resource (*)(PP_Instance
instance))&Pnacl_M14_PPB_FileIO_Create,
     .IsFileIO = (PP_Bool (*)(PP_Resource
resource))&Pnacl_M14_PPB_FileIO_IsFileIO,
     .Open = (int32_t (*)(PP_Resource file_io, PP_Resource file_ref, int32_t
open_flags, struct PP_CompletionCallback callback))&Pnacl_M14_PPB_FileIO_Open,
@@ -4058,7 +4058,7 @@ struct PPB_FileIO_1_0 Pnacl_Wrappers_PPB_FileIO_1_0 = {
     .Close = (void (*)(PP_Resource file_io))&Pnacl_M14_PPB_FileIO_Close
 };
 
-struct PPB_FileIO_1_1 Pnacl_Wrappers_PPB_FileIO_1_1 = {
+static struct PPB_FileIO_1_1 Pnacl_Wrappers_PPB_FileIO_1_1 = {
     .Create = (PP_Resource (*)(PP_Instance
instance))&Pnacl_M25_PPB_FileIO_Create,
     .IsFileIO = (PP_Bool (*)(PP_Resource
resource))&Pnacl_M25_PPB_FileIO_IsFileIO,
     .Open = (int32_t (*)(PP_Resource file_io, PP_Resource file_ref, int32_t
open_flags, struct PP_CompletionCallback callback))&Pnacl_M25_PPB_FileIO_Open,
@@ -4072,7 +4072,7 @@ struct PPB_FileIO_1_1 Pnacl_Wrappers_PPB_FileIO_1_1 = {
     .ReadToArray = (int32_t (*)(PP_Resource file_io, int64_t offset, int32_t
max_read_length, struct PP_ArrayOutput* output, struct PP_CompletionCallback
callback))&Pnacl_M25_PPB_FileIO_ReadToArray
 };
 
-struct PPB_FileRef_1_0 Pnacl_Wrappers_PPB_FileRef_1_0 = {
+static struct PPB_FileRef_1_0 Pnacl_Wrappers_PPB_FileRef_1_0 = {
     .Create = (PP_Resource (*)(PP_Resource file_system, const char*
path))&Pnacl_M14_PPB_FileRef_Create,
     .IsFileRef = (PP_Bool (*)(PP_Resource
resource))&Pnacl_M14_PPB_FileRef_IsFileRef,
     .GetFileSystemType = (PP_FileSystemType (*)(PP_Resource
file_ref))&Pnacl_M14_PPB_FileRef_GetFileSystemType,
@@ -4085,7 +4085,7 @@ struct PPB_FileRef_1_0 Pnacl_Wrappers_PPB_FileRef_1_0 = {
     .Rename = (int32_t (*)(PP_Resource file_ref, PP_Resource new_file_ref,
struct PP_CompletionCallback callback))&Pnacl_M14_PPB_FileRef_Rename
 };
 
-struct PPB_FileRef_1_1 Pnacl_Wrappers_PPB_FileRef_1_1 = {
+static struct PPB_FileRef_1_1 Pnacl_Wrappers_PPB_FileRef_1_1 = {
     .Create = (PP_Resource (*)(PP_Resource file_system, const char*
path))&Pnacl_M28_PPB_FileRef_Create,
     .IsFileRef = (PP_Bool (*)(PP_Resource
resource))&Pnacl_M28_PPB_FileRef_IsFileRef,
     .GetFileSystemType = (PP_FileSystemType (*)(PP_Resource
file_ref))&Pnacl_M28_PPB_FileRef_GetFileSystemType,
@@ -4100,7 +4100,7 @@ struct PPB_FileRef_1_1 Pnacl_Wrappers_PPB_FileRef_1_1 = {
     .ReadDirectoryEntries = (int32_t (*)(PP_Resource file_ref, struct
PP_ArrayOutput output, struct PP_CompletionCallback
callback))&Pnacl_M28_PPB_FileRef_ReadDirectoryEntries
 };
 
-struct PPB_FileSystem_1_0 Pnacl_Wrappers_PPB_FileSystem_1_0 = {
+static struct PPB_FileSystem_1_0 Pnacl_Wrappers_PPB_FileSystem_1_0 = {
     .Create = (PP_Resource (*)(PP_Instance instance, PP_FileSystemType
type))&Pnacl_M14_PPB_FileSystem_Create,
     .IsFileSystem = (PP_Bool (*)(PP_Resource
resource))&Pnacl_M14_PPB_FileSystem_IsFileSystem,
     .Open = (int32_t (*)(PP_Resource file_system, int64_t expected_size, struct
PP_CompletionCallback callback))&Pnacl_M14_PPB_FileSystem_Open,
@@ -4111,7 +4111,7 @@ struct PPB_FileSystem_1_0
Pnacl_Wrappers_PPB_FileSystem_1_0 = {
 
 /* Not generating wrapper interface for PPB_Gamepad_1_0 */
 
-struct PPB_Graphics2D_1_0 Pnacl_Wrappers_PPB_Graphics2D_1_0 = {
+static struct PPB_Graphics2D_1_0 Pnacl_Wrappers_PPB_Graphics2D_1_0 = {
     .Create = (PP_Resource (*)(PP_Instance instance, const struct PP_Size*
size, PP_Bool is_always_opaque))&Pnacl_M14_PPB_Graphics2D_Create,
     .IsGraphics2D = (PP_Bool (*)(PP_Resource
resource))&Pnacl_M14_PPB_Graphics2D_IsGraphics2D,
     .Describe = (PP_Bool (*)(PP_Resource graphics_2d, struct PP_Size* size,
PP_Bool* is_always_opaque))&Pnacl_M14_PPB_Graphics2D_Describe,
@@ -4121,7 +4121,7 @@ struct PPB_Graphics2D_1_0
Pnacl_Wrappers_PPB_Graphics2D_1_0 = {
     .Flush = (int32_t (*)(PP_Resource graphics_2d, struct PP_CompletionCallback
callback))&Pnacl_M14_PPB_Graphics2D_Flush
 };
 
-struct PPB_Graphics2D_1_1 Pnacl_Wrappers_PPB_Graphics2D_1_1 = {
+static struct PPB_Graphics2D_1_1 Pnacl_Wrappers_PPB_Graphics2D_1_1 = {
     .Create = (PP_Resource (*)(PP_Instance instance, const struct PP_Size*
size, PP_Bool is_always_opaque))&Pnacl_M27_PPB_Graphics2D_Create,
     .IsGraphics2D = (PP_Bool (*)(PP_Resource
resource))&Pnacl_M27_PPB_Graphics2D_IsGraphics2D,
     .De…
(message too large)

[jvoung (off chromium), 2014-01-08 00:54:28]

Committed patchset #3 manually as r243452 (presubmit successful).