Factor out duplicated GioMemoryFileSnapshotCtor() + NaClAppLoadFile() calls

src/trusted/service_runtime/sel_main.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.
  */
 
 /*
  * NaCl Simple/secure ELF loader (NaCl SEL).
  */
 #include "native_client/src/include/portability.h"
@@ skipping 18 matching lines @@
 #include "native_client/src/shared/platform/nacl_log.h"
 #include "native_client/src/shared/platform/nacl_sync.h"
 #include "native_client/src/shared/platform/nacl_sync_checked.h"
 #include "native_client/src/shared/srpc/nacl_srpc.h"
 
 #include "native_client/src/trusted/fault_injection/fault_injection.h"
 #include "native_client/src/trusted/fault_injection/test_injection.h"
 #include "native_client/src/trusted/perf_counter/nacl_perf_counter.h"
 #include "native_client/src/trusted/service_runtime/env_cleanser.h"
 #include "native_client/src/trusted/service_runtime/include/sys/fcntl.h"
+#include "native_client/src/trusted/service_runtime/load_file.h"
 #include "native_client/src/trusted/service_runtime/nacl_app.h"
 #include "native_client/src/trusted/service_runtime/nacl_all_modules.h"
 #include "native_client/src/trusted/service_runtime/nacl_bootstrap_channel_error_reporter.h"
 #include "native_client/src/trusted/service_runtime/nacl_debug_init.h"
 #include "native_client/src/trusted/service_runtime/nacl_error_log_hook.h"
 #include "native_client/src/trusted/service_runtime/nacl_globals.h"
 #include "native_client/src/trusted/service_runtime/nacl_signal.h"
 #include "native_client/src/trusted/service_runtime/nacl_syscall_common.h"
 #include "native_client/src/trusted/service_runtime/nacl_valgrind_hooks.h"
 #include "native_client/src/trusted/service_runtime/osx/mach_exception_handler.h"
@@ skipping 496 matching lines @@
       fprintf(stderr, "Cannot open \"%s\".\n", blob_library_file);
       exit(1);
     }
     NaClPerfCounterMark(&time_all_main, "SnapshotBlob");
     NaClPerfCounterIntervalLast(&time_all_main);
   }
 
   NaClAppInitialDescriptorHookup(nap);
 
   if (!rpc_supplies_nexe) {
-    struct GioMemoryFileSnapshot main_file;
-
-    NaClFileNameForValgrind(nacl_file);
-    if (0 == GioMemoryFileSnapshotCtor(&main_file, nacl_file)) {
-      perror("sel_main");
-      fprintf(stderr, "Cannot open \"%s\".\n", nacl_file);
-      exit(1);
-    }
-    NaClPerfCounterMark(&time_all_main, "SnapshotNaclFile");
-    NaClPerfCounterIntervalLast(&time_all_main);
-
     if (LOAD_OK == errcode) {
       NaClLog(2, "Loading nacl file %s (non-RPC)\n", nacl_file);
-      errcode = NaClAppLoadFile((struct Gio *) &main_file, nap);
+      errcode = NaClAppLoadFileFromFilename(nap, nacl_file);
       if (LOAD_OK != errcode) {
         fprintf(stderr, "Error while loading \"%s\": %s\n",
                 nacl_file,
                 NaClErrorString(errcode));
         fprintf(stderr,
                 ("Using the wrong type of nexe (nacl-x86-32"
                  " on an x86-64 or vice versa)\n"
                  "or a corrupt nexe file may be"
                  " responsible for this error.\n"));
       }
       NaClPerfCounterMark(&time_all_main, "AppLoadEnd");
       NaClPerfCounterIntervalLast(&time_all_main);
 
       NaClXMutexLock(&nap->mu);
       nap->module_load_status = errcode;
       NaClXCondVarBroadcast(&nap->cv);
       NaClXMutexUnlock(&nap->mu);
     }
 
-    if (-1 == (*((struct Gio *) &main_file)->vtbl->Close)((struct Gio *)
-                                                          &main_file)) {
-      fprintf(stderr, "Error while closing \"%s\".\n", nacl_file);
-    }
-    (*((struct Gio *) &main_file)->vtbl->Dtor)((struct Gio *) &main_file);
-
     if (fuzzing_quit_after_load) {
       exit(0);
     }
   }
 
   /*
    * Execute additional I/O redirections.  NB: since the NaClApp
    * takes ownership of host / IMC socket descriptors, all but
    * the first run will not get access if the NaClApp closes
    * them.  Currently a normal NaClApp process exit does not
@@ skipping 255 matching lines @@
   fflush(stdout);
 
   if (handle_signals) NaClSignalHandlerFini();
   NaClAllModulesFini();
 
   NaClExit(ret_code);
 
   /* Unreachable, but having the return prevents a compiler error. */
   return ret_code;
 }