diff options
| author | Henrik Nord <[email protected]> | 2012-07-18 11:01:31 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2012-07-18 11:01:36 +0200 |
| commit | f82a553307c865440a01ff38e9b9d6482fe55550 (patch) | |
| tree | c8d303dbb368744b0d8423f1ad91e6421d9dbce2 /erts/emulator | |
| parent | d946588dbf7c84b69f85947237ac6ca64c8560ad (diff) | |
| parent | 408e7760fc63a652c3ceb6479f9c7f5b3377942f (diff) | |
| download | otp-f82a553307c865440a01ff38e9b9d6482fe55550.tar.gz otp-f82a553307c865440a01ff38e9b9d6482fe55550.tar.bz2 otp-f82a553307c865440a01ff38e9b9d6482fe55550.zip | |
Merge branch 'ms/correct-formating-in-exit' into maint
* ms/correct-formating-in-exit:
Correct formating in exit error messages
OTP-10148
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/drivers/common/efile_drv.c | 2 | ||||
| -rw-r--r-- | erts/emulator/drivers/unix/unix_efile.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/erts/emulator/drivers/common/efile_drv.c b/erts/emulator/drivers/common/efile_drv.c index 603d1d47b6..347247ee7b 100644 --- a/erts/emulator/drivers/common/efile_drv.c +++ b/erts/emulator/drivers/common/efile_drv.c @@ -522,7 +522,7 @@ static void *ef_safe_alloc(Uint s) static void *ef_safe_realloc(void *op, Uint s) { void *p = EF_REALLOC(op, s); - if (!p) erl_exit(1, "efile drv: Can't reallocate %d bytes of memory\n", s); + if (!p) erl_exit(1, "efile drv: Can't reallocate %lu bytes of memory\n", (unsigned long)s); return p; } diff --git a/erts/emulator/drivers/unix/unix_efile.c b/erts/emulator/drivers/unix/unix_efile.c index ad112f7590..b250bac4dc 100644 --- a/erts/emulator/drivers/unix/unix_efile.c +++ b/erts/emulator/drivers/unix/unix_efile.c @@ -107,8 +107,8 @@ static void *ef_safe_alloc(Uint s) { void *p = EF_ALLOC(s); if (!p) erl_exit(1, - "unix efile drv: Can't allocate %d bytes of memory\n", - s); + "unix efile drv: Can't allocate %lu bytes of memory\n", + (unsigned long)s); return p; } @@ -118,8 +118,8 @@ static void *ef_safe_realloc(void *op, Uint s) { void *p = EF_REALLOC(op, s); if (!p) erl_exit(1, - "unix efile drv: Can't reallocate %d bytes of memory\n", - s); + "unix efile drv: Can't reallocate %lu bytes of memory\n", + (unsigned long)s); return p; } |