diff options
| author | Sverker Eriksson <[email protected]> | 2016-10-10 12:28:02 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-10-10 12:28:02 +0200 |
| commit | ae2dc9839aaefa6c50da75917bb82f7a1545d3ad (patch) | |
| tree | fce9d5259ad0bd4bd8bf8acd72c7f8dd730270f1 /erts | |
| parent | c8fb8c177b9f74ddea36d9c002df4f9c1bf4fb27 (diff) | |
| parent | cf102c1b1225450e7918a6119b7d949eb7e575c4 (diff) | |
| download | otp-ae2dc9839aaefa6c50da75917bb82f7a1545d3ad.tar.gz otp-ae2dc9839aaefa6c50da75917bb82f7a1545d3ad.tar.bz2 otp-ae2dc9839aaefa6c50da75917bb82f7a1545d3ad.zip | |
Merge branch 'sverker/load_nif-print-init-error/OTP-13951' into maint
* sverker/load_nif-print-init-error:
crypto: Return source line number from failed load/upgrade
erts: Print error code from failed NIF load/upgrade/reload
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/erl_nif.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c index 3a547982da..9a873857b9 100644 --- a/erts/emulator/beam/erl_nif.c +++ b/erts/emulator/beam/erl_nif.c @@ -3360,7 +3360,7 @@ BIF_RETTYPE load_nif_2(BIF_ALIST_2) veto = entry->reload(&env, &lib->priv_data, BIF_ARG_2); erts_post_nif(&env); if (veto) { - ret = load_nif_error(BIF_P, reload, "Library reload-call unsuccessful."); + ret = load_nif_error(BIF_P, reload, "Library reload-call unsuccessful (%d).", veto); } else { commit_opened_resource_types(lib); @@ -3382,7 +3382,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); @@ -3392,7 +3392,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); |