diff options
| author | Micael Karlberg <[email protected]> | 2011-03-17 12:19:57 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-17 12:19:57 +0100 |
| commit | 6b1d1ab0a27e9ed08a626e18319beb91d0a0d5ce (patch) | |
| tree | 82e54daec07390bb4cad8b279e0e8d1fd0170b78 /erts/emulator/beam/beam_debug.c | |
| parent | 4f42486c2f94860c1aa8152562760b6a2aa7c5cb (diff) | |
| parent | f861b4fdb3fd39e35f2951c53a73b30a98c7f973 (diff) | |
| download | otp-6b1d1ab0a27e9ed08a626e18319beb91d0a0d5ce.tar.gz otp-6b1d1ab0a27e9ed08a626e18319beb91d0a0d5ce.tar.bz2 otp-6b1d1ab0a27e9ed08a626e18319beb91d0a0d5ce.zip | |
Merge branch 'dev' into bmk/inets/ftp/missing_spec_causes_dialyxer_problems/OTP-9114
Also fixed a bunch of "end-years" (was 2010 but should have been 2011,
which the commit hook not happy with).
Diffstat (limited to 'erts/emulator/beam/beam_debug.c')
| -rw-r--r-- | erts/emulator/beam/beam_debug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/beam_debug.c b/erts/emulator/beam/beam_debug.c index 2855241b91..8a48049921 100644 --- a/erts/emulator/beam/beam_debug.c +++ b/erts/emulator/beam/beam_debug.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1998-2010. All Rights Reserved. + * Copyright Ericsson AB 1998-2011. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in @@ -267,7 +267,7 @@ erts_debug_disassemble_1(Process* p, Eterm addr) "unknown " HEXF "\n", instr); code_ptr++; } - bin = new_binary(p, (byte *) dsbufp->str, (int) dsbufp->str_len); + bin = new_binary(p, (byte *) dsbufp->str, dsbufp->str_len); erts_destroy_tmp_dsbuf(dsbufp); hsz = 4+4; (void) erts_bld_uword(NULL, &hsz, (BeamInstr) code_ptr); |