diff options
author | Sverker Eriksson <[email protected]> | 2016-10-10 15:16:40 +0200 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2016-10-10 15:16:40 +0200 |
commit | eb9c534cb618977dc958da169764306a81d68028 (patch) | |
tree | 9aa79b686f7778ba4bf7c5dfc78f79ec359c46d4 /erts | |
parent | 16f2daa48333cced93f4f31d9a57e5d2e3a8f9e8 (diff) | |
parent | 502ed5fd6bd36328d6be63c68ee2a56738ced058 (diff) | |
download | otp-eb9c534cb618977dc958da169764306a81d68028.tar.gz otp-eb9c534cb618977dc958da169764306a81d68028.tar.bz2 otp-eb9c534cb618977dc958da169764306a81d68028.zip |
Merge branch 'sverker/master/load_nif-print-init-error/OTP-13951'
Diffstat (limited to 'erts')
-rw-r--r-- | erts/emulator/beam/erl_nif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c index 7442e99cb3..8975eca65d 100644 --- a/erts/emulator/beam/erl_nif.c +++ b/erts/emulator/beam/erl_nif.c @@ -3339,7 +3339,7 @@ BIF_RETTYPE load_nif_2(BIF_ALIST_2) erts_post_nif(&env); if (veto) { prev_mi->nif->priv_data = prev_old_data; - ret = load_nif_error(BIF_P, upgrade, "Library upgrade-call unsuccessful."); + ret = load_nif_error(BIF_P, upgrade, "Library upgrade-call unsuccessful (%d).", veto); } else commit_opened_resource_types(lib); @@ -3349,7 +3349,7 @@ BIF_RETTYPE load_nif_2(BIF_ALIST_2) veto = entry->load(&env, &lib->priv_data, BIF_ARG_2); erts_post_nif(&env); if (veto) { - ret = load_nif_error(BIF_P, "load", "Library load-call unsuccessful."); + ret = load_nif_error(BIF_P, "load", "Library load-call unsuccessful (%d).", veto); } else commit_opened_resource_types(lib); |