src/trusted/service_runtime/sel_main.c - Issue 389022: first step in factoring out code dealing with elf into a separate library....

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 389022: first step in factoring out code dealing with elf into a separate library.... (Closed) Base URL: http://nativeclient.googlecode.com/svn/trunk/src/native_client/

Patch Set: '' Created 11 years, 1 month 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

Index: src/trusted/service_runtime/sel_main.c

===================================================================

--- src/trusted/service_runtime/sel_main.c (revision 1006)

+++ src/trusted/service_runtime/sel_main.c (working copy)

@@ -225,8 +225,7 @@

int main_thread_only = 1;

int export_addr_to = -2;

int dump_sock_addr_to = -1;

- enum NaClAbiMismatchOption abi_mismatch_option =

- NACL_ABI_MISMATCH_OPTION_ABORT;

+ enum NaClAbiCheckOption check_abi = NACL_ABI_CHECK_OPTION_CHECK;

struct NaClApp *nap;

@@ -335,7 +334,7 @@

redir_qend = &entry->next;

break;

case 'I':

- abi_mismatch_option = NACL_ABI_MISMATCH_OPTION_IGNORE;

+ check_abi = NACL_ABI_CHECK_OPTION_SKIP;

break;

case 'l':

log_file = optarg;

@@ -450,7 +449,7 @@

}

if (LOAD_OK == errcode) {

- errcode = NaClAppLoadFile((struct Gio *) &gf, nap, abi_mismatch_option);

+ errcode = NaClAppLoadFile((struct Gio *) &gf, nap, check_abi);

if (LOAD_OK != errcode) {

nap->module_load_status = errcode;

fprintf(stderr, "Error while loading \"%s\": %s\n",

« no previous file with comments | « src/trusted/service_runtime/sel_load_image.c ('k') | src/trusted/service_runtime/service_runtime.gyp » ('j') | no next file with comments »