Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(273)

Unified Diff: src/trusted/service_runtime/load_file.c

Issue 12226119: Factor out duplicated GioMemoryFileSnapshotCtor() + NaClAppLoadFile() calls (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/trusted/service_runtime/load_file.h ('k') | src/trusted/service_runtime/mmap_test.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/trusted/service_runtime/load_file.c
diff --git a/src/trusted/service_runtime/load_file.c b/src/trusted/service_runtime/load_file.c
new file mode 100644
index 0000000000000000000000000000000000000000..d905aca8c00a511b3b84ec1719b067c912e22876
--- /dev/null
+++ b/src/trusted/service_runtime/load_file.c
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2013 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.
+ */
+
+#include "native_client/src/trusted/service_runtime/load_file.h"
+
+#include "native_client/src/shared/gio/gio.h"
+#include "native_client/src/trusted/service_runtime/nacl_valgrind_hooks.h"
+#include "native_client/src/trusted/service_runtime/sel_ldr.h"
+
+
+NaClErrorCode NaClAppLoadFileFromFilename(struct NaClApp *nap,
+ const char *filename) {
+ struct GioMemoryFileSnapshot gio_file;
+ struct Gio *gio;
+ NaClErrorCode err;
+
+ NaClFileNameForValgrind(filename);
+
+ if (!GioMemoryFileSnapshotCtor(&gio_file, filename)) {
+ return LOAD_OPEN_ERROR;
+ }
+ gio = &gio_file.base.base;
+ err = NaClAppLoadFile(gio, nap);
+ if (err != LOAD_OK) {
+ return err;
+ }
+ if (gio->vtbl->Close(gio) != 0) {
+ err = LOAD_INTERNAL;
+ }
+ gio->vtbl->Dtor(gio);
+ return err;
+}
« no previous file with comments | « src/trusted/service_runtime/load_file.h ('k') | src/trusted/service_runtime/mmap_test.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698