diff options
| author | Henrik Nord <[email protected]> | 2011-05-06 11:54:22 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-05-06 11:54:32 +0200 |
| commit | 3bc88daccddc4be0a834da18ef0cb35529dcf383 (patch) | |
| tree | 3d8b009f4b2c69473b50f62cf78fa8cadab5b5a1 | |
| parent | 8e6ae6d0be47fa7785b40788b9adb46ba47b894e (diff) | |
| parent | a8bacf37001f4f73f51b92c1738283b7dbb3bb4f (diff) | |
| download | otp-3bc88daccddc4be0a834da18ef0cb35529dcf383.tar.gz otp-3bc88daccddc4be0a834da18ef0cb35529dcf383.tar.bz2 otp-3bc88daccddc4be0a834da18ef0cb35529dcf383.zip | |
Merge branch 'ms/beam-fix-format-specifiers-in-erl_exit-msg' into dev
* ms/beam-fix-format-specifiers-in-erl_exit-msg:
Fix format specifiers in erl_exit messages
OTP-9262
| -rw-r--r-- | erts/emulator/beam/bif.c | 4 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_gc.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c index 6b1ce823cb..b3325d635b 100644 --- a/erts/emulator/beam/bif.c +++ b/erts/emulator/beam/bif.c @@ -3360,7 +3360,7 @@ BIF_RETTYPE erts_debug_display_1(BIF_ALIST_1) erts_dsprintf_buf_t *dsbufp = erts_create_tmp_dsbuf(64); pres = erts_dsprintf(dsbufp, "%.*T\n", INT_MAX, BIF_ARG_1); if (pres < 0) - erl_exit(1, "Failed to convert term to string: %d (s)\n", + erl_exit(1, "Failed to convert term to string: %d (%s)\n", -pres, erl_errno_id(-pres)); hp = HAlloc(BIF_P, 2*dsbufp->str_len); /* we need length * 2 heap words */ res = buf_to_intlist(&hp, dsbufp->str, dsbufp->str_len, NIL); @@ -3478,7 +3478,7 @@ term2list_dsprintf(Process *p, Eterm term) erts_dsprintf_buf_t *dsbufp = erts_create_tmp_dsbuf(64); pres = erts_dsprintf(dsbufp, "%T", term); if (pres < 0) - erl_exit(1, "Failed to convert term to list: %d (s)\n", + erl_exit(1, "Failed to convert term to list: %d (%s)\n", -pres, erl_errno_id(-pres)); hp = HAlloc(p, 2*dsbufp->str_len); /* we need length * 2 heap words */ res = buf_to_intlist(&hp, dsbufp->str, dsbufp->str_len, NIL); diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c index c30d67ac88..5edcd667e7 100644 --- a/erts/emulator/beam/erl_gc.c +++ b/erts/emulator/beam/erl_gc.c @@ -215,7 +215,7 @@ erts_next_heap_size(Uint size, Uint offset) low = mid + 1; } } - erl_exit(1, "no next heap size found: %d, offset %d\n", size, offset); + erl_exit(1, "no next heap size found: %lu, offset %lu\n", (unsigned long)size, (unsigned long)offset); } return 0; } |